Merge branch 'master' of https://github.com/FOSSEE/online_test into UI-modifications

Resolved
Conflicts:
	yaksh/templates/manage.html
	yaksh/templates/yaksh/design_questionpaper.html

1 files changed, 11 insertions, 4 deletions

diff --git a/yaksh/forms.py b/yaksh/forms.py
index a12ce9a..1931fad 100644
--- a/yaksh/forms.py
+++ b/yaksh/forms.py
@@ -1,6 +1,6 @@
 from django import forms
-from yaksh.models import get_model_class, Profile, Quiz, Question, TestCase, Course, StandardTestCase, StdioBasedTestCase
-
+from yaksh.models import get_model_class, Profile, Quiz, Question, TestCase, Course,\
+                         QuestionPaper, StandardTestCase, StdioBasedTestCase
 from django.contrib.auth import authenticate
 from django.contrib.auth.models import User
 from django.contrib.contenttypes.models import ContentType
@@ -177,7 +177,7 @@ class QuestionForm(forms.ModelForm):
 
     class Meta:
         model = Question
-        exclude = ['user']
+        exclude = ['user', 'active']
 
 
 class FileForm(forms.Form):
@@ -199,7 +199,7 @@ class QuestionFilterForm(forms.Form):
         super(QuestionFilterForm, self).__init__(*args, **kwargs)
         questions = Question.objects.filter(user_id=user.id)
         points_list = questions.values_list('points', flat=True).distinct()
-        points_options = [('select', 'Select Marks')]
+        points_options = [(None, 'Select Marks')]
         points_options.extend([(point, point) for point in points_list])
         self.fields['marks'] = forms.FloatField(widget=forms.Select\
                                                     (choices=points_options))
@@ -215,6 +215,7 @@ class CourseForm(forms.ModelForm):
         model = Course
         fields = ['name', 'active', 'enrollment']
 
+
 class ProfileForm(forms.ModelForm):
     """ profile form for students and moderators """
 
@@ -236,3 +237,9 @@ class ProfileForm(forms.ModelForm):
 
 class UploadFileForm(forms.Form):
     file = forms.FileField()
+
+
+class QuestionPaperForm(forms.ModelForm):
+    class Meta:
+        model = QuestionPaper
+        fields = ['shuffle_questions']