From f531b9ca9c088263a53aff8574e93b74945b468f Mon Sep 17 00:00:00 2001
From: mahesh
Date: Fri, 16 Feb 2018 16:30:55 +0530
Subject: Add shuffle_testcases to QuestionPaper model instead of Question

---
 yaksh/forms.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'yaksh/forms.py')

diff --git a/yaksh/forms.py b/yaksh/forms.py
index 258a1ee..e53eda3 100644
--- a/yaksh/forms.py
+++ b/yaksh/forms.py
@@ -308,7 +308,7 @@ class UploadFileForm(forms.Form):
 class QuestionPaperForm(forms.ModelForm):
     class Meta:
         model = QuestionPaper
-        fields = ['shuffle_questions']
+        fields = ['shuffle_questions', 'shuffle_testcases']
 
 
 class LessonForm(forms.ModelForm):
-- 
cgit 


From 453a5d8f191b62af45426d5c98a99552c34ba396 Mon Sep 17 00:00:00 2001
From: maheshgudi
Date: Mon, 5 Feb 2018 17:06:09 +0530
Subject: Include Rebase changes from shuffle testcases

---
 yaksh/forms.py | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'yaksh/forms.py')

diff --git a/yaksh/forms.py b/yaksh/forms.py
index e53eda3..7eae673 100644
--- a/yaksh/forms.py
+++ b/yaksh/forms.py
@@ -35,6 +35,9 @@ question_types = (
     ("integer", "Answer in Integer"),
     ("string", "Answer in String"),
     ("float", "Answer in Float"),
+    ("arrange", "Arrange Options in Order"),
+
+
 )
 
 test_case_types = (
-- 
cgit 


From 55dd1da1191dccbf66193ccd4d1a1a833bfe4513 Mon Sep 17 00:00:00 2001
From: mahesh
Date: Thu, 8 Feb 2018 13:02:37 +0530
Subject: Add testcases for custom templatetag filters

---
 yaksh/forms.py | 2 --
 1 file changed, 2 deletions(-)

(limited to 'yaksh/forms.py')

diff --git a/yaksh/forms.py b/yaksh/forms.py
index 7eae673..9317a8e 100644
--- a/yaksh/forms.py
+++ b/yaksh/forms.py
@@ -36,8 +36,6 @@ question_types = (
     ("string", "Answer in String"),
     ("float", "Answer in Float"),
     ("arrange", "Arrange Options in Order"),
-
-
 )
 
 test_case_types = (
-- 
cgit 


From 07be6be0e805e17e45290b0e8137c044b2094edc Mon Sep 17 00:00:00 2001
From: mahesh
Date: Fri, 9 Feb 2018 15:43:44 +0530
Subject: Change custom filter function to get_answer_for_arrange_options

---
 yaksh/forms.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'yaksh/forms.py')

diff --git a/yaksh/forms.py b/yaksh/forms.py
index 9317a8e..4c690b1 100644
--- a/yaksh/forms.py
+++ b/yaksh/forms.py
@@ -35,7 +35,7 @@ question_types = (
     ("integer", "Answer in Integer"),
     ("string", "Answer in String"),
     ("float", "Answer in Float"),
-    ("arrange", "Arrange Options in Order"),
+    ("arrange", "Arrange Options in Correct Order"),
 )
 
 test_case_types = (
-- 
cgit 


From 2feec77152518f5f60ddfc46bb22857278c1d7ba Mon Sep 17 00:00:00 2001
From: mahesh
Date: Fri, 16 Feb 2018 19:55:47 +0530
Subject: Change question type name to Arrange in correct order

---
 yaksh/forms.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'yaksh/forms.py')

diff --git a/yaksh/forms.py b/yaksh/forms.py
index 4c690b1..cbf3033 100644
--- a/yaksh/forms.py
+++ b/yaksh/forms.py
@@ -35,7 +35,7 @@ question_types = (
     ("integer", "Answer in Integer"),
     ("string", "Answer in String"),
     ("float", "Answer in Float"),
-    ("arrange", "Arrange Options in Correct Order"),
+    ("arrange", "Arrange in Correct Order"),
 )
 
 test_case_types = (
-- 
cgit