removed some unnecessary view functions, removed page counter which was

used to display an advert every X number of pages

diff --git a/quiz/tests.py b/quiz/tests.py
index 4c98f936d2af0aa4c0cc2664b216f4d55f88735c..67860a6b2b2a1136174280154dc2403599e60163 100644 (file)
--- a/quiz/tests.py
+++ b/quiz/tests.py
@@ -322,14 +322,12 @@ class TestQuestionViewsAnon(TestCase):
         self.assertEqual(self.client.session.get_expiry_age(), 259200)
         self.assertEqual(self.client.session['1_q_list'], [1, 2])
         self.assertEqual(self.client.session['1_score'], 0)
-        self.assertEqual(self.client.session['page_count'], 0)
         self.assertEqual(response.context['quiz'].id, self.quiz1.id)
         self.assertEqual(response.context['question'].content,
                          self.question1.content)
         self.assertEqual(response.context['question_type'],
                          self.question1.__class__.__name__)
         self.assertEqual(response.context['previous'], {})
-        self.assertEqual(response.context['show_advert'], False)
         self.assertTemplateUsed('question.html')
 
         session = self.client.session
@@ -340,7 +338,6 @@ class TestQuestionViewsAnon(TestCase):
         self.assertEqual(self.client.session.get_expiry_age(), 1)
         self.assertEqual(self.client.session['1_q_list'], [1, 2])
         self.assertEqual(self.client.session['1_score'], 0)
-        self.assertEqual(self.client.session['page_count'], 0)
 
     def test_quiz_take_anon_submit(self):
         # show first question
@@ -471,14 +468,12 @@ class TestQuestionViewsUser(TestCase):
         self.assertEqual(sitting.user.username, 'jacob')
         self.assertEqual(sitting.question_list, '1,2,')
         self.assertEqual(sitting.current_score, 0)
-        self.assertEqual(self.client.session['page_count'], 0)
         self.assertEqual(response.context['quiz'].id, self.quiz1.id)
         self.assertEqual(response.context['question'].content,
                          self.question1.content)
         self.assertEqual(response.context['question_type'],
                          self.question1.__class__.__name__)
         self.assertEqual(response.context['previous'], {})
-        self.assertEqual(response.context['show_advert'], False)
         self.assertTemplateUsed('question.html')
 
         response = self.client.get('/q/tq1/take/')
@@ -522,7 +517,6 @@ class TestQuestionViewsUser(TestCase):
         self.assertEqual(progress_count, 1)
         self.assertIn(self.c1.category, progress)
         self.assertEqual(sitting.question_list, '2,')
-        self.assertEqual(self.client.session['page_count'], 1)
         self.assertIn('123', response.context['previous']['previous_answer'])
         self.assertEqual(response.context['question'].content,
                          self.question2.content)

diff --git a/quiz/views.py b/quiz/views.py
index 2f58fd91233e06606e624a26026cb451339b8f0e..a6bc4d5b5cb50426069df6a1ac883ed69aab195f 100644 (file)
--- a/quiz/views.py
+++ b/quiz/views.py
@@ -80,10 +80,6 @@ def quiz_take(request, quiz_name):
         except Sitting.DoesNotExist:
             sitting = Sitting.objects.new_sitting(request.user, quiz)
 
-            if 'page_count' not in request.session:
-                #  session page count
-                request.session['page_count'] = 0
-
         except Sitting.MultipleObjectsReturned:
             sitting = Sitting.objects.filter(user=request.user,
                                              quiz=quiz,
@@ -126,10 +122,6 @@ def new_anon_quiz_session(request, quiz):
     # session list of questions
     request.session[str(quiz.id) + "_q_list"] = question_list
 
-    if 'page_count' not in request.session:
-        # session page count, used for adverts on original website
-        request.session['page_count'] = 0
-
     return load_anon_next_question(request, quiz)
 
 
@@ -143,30 +135,11 @@ def load_anon_next_question(request, quiz):
         previous = question_check_anon(request, quiz)
         question_list = question_list[1:]
         request.session[str(quiz.id) + "_q_list"] = question_list
-        request.session['page_count'] = request.session['page_count'] + 1
 
     if not request.session[str(quiz.id) + "_q_list"]:
         #  no questions left!
         return final_result_anon(request, quiz, previous)
 
-    show_advert = False
-
-    """
-    This is a counter that allows you to add something into the
-    template every X amount of pages.
-    In my original site, I used this to show a full page advert
-    every 10 pages.
-    """
-
-    # try:
-    #     if request.session['page_count'] > 0 and \
-    #        request.session['page_count'] % 10 is 0:
-    #         request.session['page_count'] = request.session['page_count'] + 1
-    #         show_advert = True
-
-    # except KeyError:
-    #     request.session['page_count'] = 0
-
     next_question_id = question_list[0]
     next_question = Question.objects.get_subclass(id=next_question_id)
     question_type = next_question.__class__.__name__
@@ -175,8 +148,7 @@ def load_anon_next_question(request, quiz):
                               {'quiz': quiz,
                                'question': next_question,
                                'question_type': question_type,
-                               'previous': previous,
-                               'show_advert': show_advert},
+                               'previous': previous},
                               context_instance=RequestContext(request))
 
 
@@ -203,7 +175,6 @@ def user_load_next_question(request, sitting, quiz):
                         'previous_question': question}
 
         sitting.remove_first_question()
-        request.session['page_count'] = request.session['page_count'] + 1
 
     question_ID = sitting.get_first_question()
 
@@ -211,17 +182,6 @@ def user_load_next_question(request, sitting, quiz):
         #  no questions left
         return final_result_user(request, sitting, previous)
 
-    show_advert = False
-
-    # try:
-    #     if request.session['page_count'] > 0 and \
-    #        request.session['page_count'] % 10 is 0:
-    #         request.session['page_count'] = request.session['page_count'] + 1
-    #         show_advert = True
-
-    # except KeyError:
-    #     request.session['page_count'] = 0
-
     next_question = Question.objects.get_subclass(id=question_ID)
     question_type = next_question.__class__.__name__
 
@@ -229,8 +189,7 @@ def user_load_next_question(request, sitting, quiz):
                               {'quiz': quiz,
                                'question': next_question,
                                'question_type': question_type,
-                               'previous': previous,
-                               'show_advert': show_advert},
+                               'previous': previous},
                               context_instance=RequestContext(request))