fix design question paper views and tests

3 files changed, 44 insertions, 27 deletions

diff --git a/yaksh/static/yaksh/js/question_paper_creation.js b/yaksh/static/yaksh/js/question_paper_creation.js
index 871d6cc..1159dd3 100644
--- a/yaksh/static/yaksh/js/question_paper_creation.js
+++ b/yaksh/static/yaksh/js/question_paper_creation.js
@@ -59,7 +59,7 @@ $(document).ready(function(){
         return true;
     });
 
-    $('#add_checkall').change(function () {
+    $('#add_checkall').on("change", function () {
         if($(this).prop("checked")) {
             $("#fixed-available input:checkbox").each(function(index, element) {
                 if(isNaN($(this).val())) {return};
@@ -74,7 +74,7 @@ $(document).ready(function(){
         }
     });
 
-    $('#remove_checkall').change(function () {
+    $('#remove_checkall').on("change", function () {
         if($(this).prop("checked")) {
             $("#fixed-added input:checkbox").each(function (index, element) {
                 if(isNaN($(this).val())) { return };
@@ -83,7 +83,6 @@ $(document).ready(function(){
             });
         } else {
             $("#fixed-added input:checkbox").each(function (index, element) {
-                console.log('unchecked');
                 $(this).prop('checked', false);
                 checked_vals.pop(parseInt($(this).val()));
             });
diff --git a/yaksh/test_views.py b/yaksh/test_views.py
index 5876f03..df408bb 100644
--- a/yaksh/test_views.py
+++ b/yaksh/test_views.py
@@ -5964,12 +5964,11 @@ class TestQuestionPaper(TestCase):
                   'add-random': ['']}
             )
 
-        self.assertEqual(response.status_code, 200)
-        self.assertTemplateUsed(response, 'yaksh/design_questionpaper.html')
-        random_set = response.context['random_sets'][0]
-        added_random_ques = random_set.questions.all()
-        self.assertIn(self.random_que1, added_random_ques)
-        self.assertIn(self.random_que2, added_random_ques)
+        self.assertEqual(response.status_code, 302)
+        self.assertTrue(
+            self.question_paper.random_questions.filter(
+                id__in=[self.random_que1.id, self.random_que2.id]).exists()
+        )
 
         # Check if questions already exists
         self.client.login(
@@ -5996,10 +5995,11 @@ class TestQuestionPaper(TestCase):
             data={'checked_ques': [self.fixed_que.id],
                   'add-fixed': ''}
             )
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.context['qpaper'], self.fixed_question_paper)
-        self.assertEqual(response.context['fixed_questions'][0],
-                         self.fixed_que)
+        self.assertEqual(response.status_code, 302)
+        self.assertTrue(
+            self.fixed_question_paper.fixed_questions.filter(
+                id=self.fixed_que.id).exists()
+        )
 
         # Add one more fixed question in question paper
         response = self.client.post(
@@ -6010,10 +6010,11 @@ class TestQuestionPaper(TestCase):
             data={'checked_ques': [self.question_float.id],
                   'add-fixed': ''}
             )
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.context['qpaper'], self.fixed_question_paper)
-        self.assertEqual(response.context['fixed_questions'],
-                         [self.fixed_que, self.question_float])
+        self.assertEqual(response.status_code, 302)
+        self.assertTrue(
+            self.fixed_question_paper.fixed_questions.filter(
+                id=self.question_float.id).exists()
+        )
 
         # Remove fixed question from question paper
         response = self.client.post(
@@ -6024,10 +6025,11 @@ class TestQuestionPaper(TestCase):
             data={'added-questions': [self.fixed_que.id],
                   'remove-fixed': ''}
             )
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.context['qpaper'], self.fixed_question_paper)
-        self.assertEqual(response.context['fixed_questions'],
-                         [self.question_float])
+        self.assertEqual(response.status_code, 302)
+        self.assertFalse(
+            self.fixed_question_paper.fixed_questions.filter(
+                id=self.fixed_que.id).exists()
+        )
 
         # Remove one more fixed question from question paper
         response = self.client.post(
@@ -6038,9 +6040,11 @@ class TestQuestionPaper(TestCase):
             data={'added-questions': [self.question_float.id],
                   'remove-fixed': ''}
             )
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.context['qpaper'], self.fixed_question_paper)
-        self.assertEqual(response.context['fixed_questions'], [])
+        self.assertEqual(response.status_code, 302)
+        self.assertFalse(
+            self.fixed_question_paper.fixed_questions.filter(
+                id=self.question_float.id).exists()
+        )
 
         # Remove random questions from question paper
         random_que_set = self.question_paper.random_questions.all().first()
@@ -6052,9 +6056,11 @@ class TestQuestionPaper(TestCase):
             data={'random_sets': random_que_set.id,
                   'remove-random': ''}
             )
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.context['qpaper'], self.question_paper)
-        self.assertEqual(len(response.context['random_sets']), 0)
+        self.assertEqual(response.status_code, 302)
+        self.assertFalse(
+            self.question_paper.random_questions.filter(
+                id=random_que_set.id).exists()
+        )
 
 
 class TestLearningModule(TestCase):
diff --git a/yaksh/views.py b/yaksh/views.py
index afa673f..2fe93ea 100644
--- a/yaksh/views.py
+++ b/yaksh/views.py
@@ -1491,6 +1491,12 @@ def design_questionpaper(request, course_id, quiz_id, questionpaper_id=None):
                 random_set.questions.add(*random_ques)
                 question_paper.random_questions.add(random_set)
                 messages.success(request, "Questions removed successfully")
+                return redirect(
+                    'yaksh:designquestionpaper',
+                    course_id=course_id,
+                    quiz_id=quiz_id,
+                    questionpaper_id=questionpaper_id
+                )
             else:
                 messages.warning(request, "Please select atleast one question")
 
@@ -1499,6 +1505,12 @@ def design_questionpaper(request, course_id, quiz_id, questionpaper_id=None):
             if random_set_ids:
                 question_paper.random_questions.remove(*random_set_ids)
                 messages.success(request, "Questions removed successfully")
+                return redirect(
+                    'yaksh:designquestionpaper',
+                    course_id=course_id,
+                    quiz_id=quiz_id,
+                    questionpaper_id=questionpaper_id
+                )
             else:
                 messages.warning(request, "Please select question set")