+ +

No quizzes available.

{% endif %} {# ############################################################### #} {# This is rendered when we are just viewing exam/monitor #} {% if quizzes %} -

Available quizzes

{{ quiz.description }} results

+ {% if papers %} {#

Quiz: {{ quiz_name }}

Number of papers: {{ papers|length }}

- + @@ -61,7 +87,12 @@

No answer papers so far.

{% endif %} {# if papers #} {% endif %} - Admin + + + + {% endblock content %} -- cgit From 493f228229d96dab4a13b21cf7d4d089fcf7b2fd Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Mon, 6 Feb 2012 15:20:41 +0530 Subject: removed & tags from the forms --- testapp/templates/exam/grade_user.html | 5 +--- testapp/templates/exam/intro.html | 6 +---- testapp/templates/exam/login.html | 8 ++---- testapp/templates/exam/quit.html | 46 ++++++++++++++-------------------- testapp/templates/exam/register.html | 5 ---- testapp/templates/exam/user_data.html | 6 +---- 6 files changed, 24 insertions(+), 52 deletions(-) diff --git a/testapp/templates/exam/grade_user.html b/testapp/templates/exam/grade_user.html index 2237475..89faf46 100644 --- a/testapp/templates/exam/grade_user.html +++ b/testapp/templates/exam/grade_user.html @@ -3,8 +3,7 @@ {% block title %} Grading papers for {{ data.user.get_full_name.title }} {% endblock title %} {% block content %} - - +

@@ -99,6 +98,4 @@ Marks: - - {% endblock content %} diff --git a/testapp/templates/exam/intro.html b/testapp/templates/exam/intro.html index 2306fb7..35a6923 100644 --- a/testapp/templates/exam/intro.html +++ b/testapp/templates/exam/intro.html @@ -3,8 +3,7 @@ {% block title %}Instructions and Rules {% endblock %} {% block content %} - - +

- - - {% endblock content %} diff --git a/testapp/templates/exam/login.html b/testapp/templates/exam/login.html index 9420903..770ceb4 100644 --- a/testapp/templates/exam/login.html +++ b/testapp/templates/exam/login.html @@ -3,8 +3,7 @@ {% block title %}Login{% endblock title %} {% block content %} - - +

- - - -{% endblock content %} \ No newline at end of file +{% endblock content %} diff --git a/testapp/templates/exam/quit.html b/testapp/templates/exam/quit.html index c31fd87..3ee85db 100644 --- a/testapp/templates/exam/quit.html +++ b/testapp/templates/exam/quit.html @@ -2,36 +2,28 @@ {% block title %}Quit exam {% endblock %} - -{% block content %} - -

- -

- - -

Your current answers are saved.

Are you sure you wish to quit the exam?

- - -{% csrf_token %} +{% block content %} - - - -

+ +

Your current answers are saved.

Are you sure you wish to quit the exam?

+ + {% csrf_token %} + + +

- +

- - {% endblock content %} diff --git a/testapp/templates/exam/register.html b/testapp/templates/exam/register.html index a90f21c..1555ab3 100644 --- a/testapp/templates/exam/register.html +++ b/testapp/templates/exam/register.html @@ -4,7 +4,6 @@ {% block content %} -

Name

@@ -33,7 +30,5 @@

- - {% endblock content %} diff --git a/testapp/templates/exam/user_data.html b/testapp/templates/exam/user_data.html index 8026a73..b9cbbb5 100644 --- a/testapp/templates/exam/user_data.html +++ b/testapp/templates/exam/user_data.html @@ -3,8 +3,7 @@ {% block title %} Data for user {{ data.user.get_full_name.title }} {% endblock title %} {% block content %} - - +

- - - {% endblock content %} -- cgit From f9540ba9b83ac2dc33885f3c8089f36a218d6273 Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Mon, 6 Feb 2012 15:29:25 +0530 Subject: removed & tags --- testapp/templates/exam/complete.html | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/testapp/templates/exam/complete.html b/testapp/templates/exam/complete.html index 6790ea1..6a401a4 100644 --- a/testapp/templates/exam/complete.html +++ b/testapp/templates/exam/complete.html @@ -4,8 +4,7 @@ {% block content %} - - +

- - + {% endblock content %} -- cgit From 85a76d4777d3917cf5dbb716107581d4998c408d Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Tue, 7 Feb 2012 11:45:56 +0530 Subject: changes in question.html --- testapp/templates/exam/question.html | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/testapp/templates/exam/question.html b/testapp/templates/exam/question.html index d843981..a02e8c4 100644 --- a/testapp/templates/exam/question.html +++ b/testapp/templates/exam/question.html @@ -1,7 +1,6 @@ {% extends "base.html" %} - - + {% block title %} Answer question {% endblock %} {% block script %} @@ -46,20 +45,32 @@ function update_time() {% endblock script %} - - + {% block onload %} onload="update_time()" {% endblock onload %} {% block content %} -

+ +

@@ -96,15 +107,11 @@ function update_time()

Time left:

- +

- + {% endblock content %} -- cgit From 7c65d02d8a1f2ea72eabf3f13f85b8b444b1505e Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Wed, 15 Feb 2012 18:35:40 +0530 Subject: New views to manage/moderate Quiz --- testapp/exam/urls.py | 4 ++++ testapp/exam/views.py | 17 +++++++++++++++++ testapp/static/exam/css/base.css | 4 ++-- testapp/templates/exam/grade_user.html | 24 ++++-------------------- testapp/templates/exam/monitor.html | 29 +++-------------------------- 5 files changed, 30 insertions(+), 48 deletions(-) diff --git a/testapp/exam/urls.py b/testapp/exam/urls.py index 34e329f..4545897 100644 --- a/testapp/exam/urls.py +++ b/testapp/exam/urls.py @@ -3,6 +3,10 @@ from django.conf.urls.defaults import patterns, include, url urlpatterns = patterns('exam.views', url(r'^$', 'index'), url(r'^login/$', 'user_login'), + url(r'^manage/$', 'prof_manage'), + url(r'^addquestion/$', 'add_question'), + url(r'^addquiz/$', 'add_quiz'), + url(r'^grade_user/$', 'show_all_users'), url(r'^register/$', 'user_register'), url(r'^start/$', 'start'), url(r'^quit/$', 'quit'), diff --git a/testapp/exam/views.py b/testapp/exam/views.py index 05b69d1..aed45d5 100644 --- a/testapp/exam/views.py +++ b/testapp/exam/views.py @@ -90,6 +90,15 @@ def user_register(request): {'form':form}, context_instance=RequestContext(request)) +def add_question(request): + return render_to_response('exam/add_question.html',{}) + +def add_quiz(request): + return render_to_response('exam/add_quiz.html',{}) + +def prof_manage(request): + return render_to_response('manage.html',{}) + def user_login(request): """Take the credentials of the user and log the user in.""" @@ -309,6 +318,12 @@ def get_user_data(username): data['papers'] = papers return data +def show_all_users(request): + user = User.objects.filter(username__contains="") + context = { 'user':user } + print context + return my_render_to_response('exam/showusers.html',context,context_instance=RequestContext(request)) + def user_data(request, username): """Render user data.""" current_user = request.user @@ -342,10 +357,12 @@ def grade_user(request, username): paper.save() context = {'data': data} + print context return my_render_to_response('exam/user_data.html', context, context_instance=RequestContext(request)) else: context = {'data': data} + print context return my_render_to_response('exam/grade_user.html', context, context_instance=RequestContext(request)) diff --git a/testapp/static/exam/css/base.css b/testapp/static/exam/css/base.css index ef5b374..6891402 100644 --- a/testapp/static/exam/css/base.css +++ b/testapp/static/exam/css/base.css @@ -207,7 +207,7 @@ body { } .container-fluid > .sidebar { position: absolute; - top: 0; + top: 65px; left: 20px; width: 220px; } @@ -2132,7 +2132,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner { background-color: #f5f5f5; margin-bottom: 20px; padding: 19px; - min-height: 20px; + min-height: 505px; border: 1px solid #eee; border: 1px solid rgba(0, 0, 0, 0.05); -webkit-border-radius: 4px; diff --git a/testapp/templates/exam/grade_user.html b/testapp/templates/exam/grade_user.html index 89faf46..fa0e516 100644 --- a/testapp/templates/exam/grade_user.html +++ b/testapp/templates/exam/grade_user.html @@ -1,18 +1,10 @@ -{% extends "base.html" %} +{% extends "manage.html" %} {% block title %} Grading papers for {{ data.user.get_full_name.title }} {% endblock title %} -{% block content %} - -

- -

Grading papers for {{ data.user.get_full_name.title }}

+{% block subtitle %}Grading papers for {{ data.user.get_full_name.title }}{% endblock %} +{% block manage %}

Name: {{ data.user.get_full_name.title }} @@ -89,13 +81,5 @@ Marks: Admin -

- - -

-{% endblock content %} +{% endblock%} diff --git a/testapp/templates/exam/monitor.html b/testapp/templates/exam/monitor.html index 0b59f76..4847545 100644 --- a/testapp/templates/exam/monitor.html +++ b/testapp/templates/exam/monitor.html @@ -1,23 +1,13 @@ -{% extends "base.html" %} - - +{% extends "manage.html" %} {% block title %} Quiz results {% endblock title %} {% block meta %} {% endblock meta %} - -{% block content %} -

- -

No quizzes available.

@@ -27,9 +17,6 @@ {# This is rendered when we are just viewing exam/monitor #} {% if quizzes %}

Available quizzes

{{ quiz.description }} results

{% if papers %} {#

Quiz: {{ quiz_name }}

#} @@ -88,11 +72,4 @@ table tbody th { {% endif %} {# if papers #} {% endif %} Admin -

- - - -

-{% endblock content %} +{% endblock %} -- cgit From 8c548960349a01393141845d0ae1e728e9130b7c Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Thu, 16 Feb 2012 11:18:55 +0530 Subject: The new html files --- testapp/templates/exam/add_question.html | 9 +++++++ testapp/templates/exam/add_quiz.html | 10 ++++++++ testapp/templates/exam/showusers.html | 12 +++++++++ testapp/templates/manage.html | 42 ++++++++++++++++++++++++++++++++ 4 files changed, 73 insertions(+) create mode 100644 testapp/templates/exam/add_question.html create mode 100644 testapp/templates/exam/add_quiz.html create mode 100644 testapp/templates/exam/showusers.html create mode 100644 testapp/templates/manage.html diff --git a/testapp/templates/exam/add_question.html b/testapp/templates/exam/add_question.html new file mode 100644 index 0000000..fb5d38b --- /dev/null +++ b/testapp/templates/exam/add_question.html @@ -0,0 +1,9 @@ +{% extends "manage.html" %} + +{% block subtitle %} +Add Question +{% endblock %} + +{% block manage %} +

Add Question +{% endblock %} diff --git a/testapp/templates/exam/add_quiz.html b/testapp/templates/exam/add_quiz.html new file mode 100644 index 0000000..d568b30 --- /dev/null +++ b/testapp/templates/exam/add_quiz.html @@ -0,0 +1,10 @@ +{% extends "manage.html" %} + + +{% block subtitle %} +Add Quiz +{% endblock %} + +{% block manage %} +

Add Quiz +{% endblock %} diff --git a/testapp/templates/exam/showusers.html b/testapp/templates/exam/showusers.html new file mode 100644 index 0000000..ad9534f --- /dev/null +++ b/testapp/templates/exam/showusers.html @@ -0,0 +1,12 @@ +{% extends "manage.html" %} + + +{% block subtitle %} +List of Users +{% endblock %} + +{% block manage %} +{% for name in user %} +{{ name }}
+{% endfor %} +{% endblock %} diff --git a/testapp/templates/manage.html b/testapp/templates/manage.html new file mode 100644 index 0000000..3b67999 --- /dev/null +++ b/testapp/templates/manage.html @@ -0,0 +1,42 @@ +{% extends "base.html" %} + +{% block title %}Manage{% endblock title %} + +{% block content %} + +

+ +

+ + +

{% block subtitle %} {% endblock %}

+ {% block manage %} + {% endblock %} +

+ + +

+ + +{% endblock content %} -- cgit From d18df85469fc993520ee397f4a28b422c550408a Mon Sep 17 00:00:00 2001 From: jayparikh111 Date: Thu, 16 Feb 2012 12:51:32 +0530 Subject: Form to Add New Quiz --- testapp/exam/forms.py | 9 ++++++++- testapp/exam/views.py | 23 +++++++++++++++++++++-- testapp/templates/exam/add_quiz.html | 19 ++++++++++++++++++- 3 files changed, 47 insertions(+), 4 deletions(-) diff --git a/testapp/exam/forms.py b/testapp/exam/forms.py index d99a04d..a867f5f 100644 --- a/testapp/exam/forms.py +++ b/testapp/exam/forms.py @@ -5,7 +5,7 @@ from django.contrib.auth import authenticate from django.contrib.auth.models import User from string import letters, punctuation, digits - +import datetime UNAME_CHARS = letters + "._" + digits PWD_CHARS = letters + punctuation + digits @@ -96,3 +96,10 @@ class UserLoginForm(forms.Form): return user + + +class QuizForm(forms.Form): + start_date = forms.DateField(initial=datetime.date.today) + duration = forms.IntegerField() + active = forms.BooleanField(required = False) + description = forms.CharField(max_length=256, widget=forms.Textarea(attrs={'cols':20,'rows':2})) diff --git a/testapp/exam/views.py b/testapp/exam/views.py index aed45d5..22e701e 100644 --- a/testapp/exam/views.py +++ b/testapp/exam/views.py @@ -14,7 +14,7 @@ from django.db.models import Sum # Local imports. from exam.models import Quiz, Question, QuestionPaper, Profile, Answer, User -from exam.forms import UserRegisterForm, UserLoginForm +from exam.forms import UserRegisterForm, UserLoginForm, QuizForm from exam.xmlrpc_clients import code_server from settings import URL_ROOT @@ -94,7 +94,26 @@ def add_question(request): return render_to_response('exam/add_question.html',{}) def add_quiz(request): - return render_to_response('exam/add_quiz.html',{}) + + if request.method == "POST": + form = QuizForm(request.POST) + if form.is_valid(): + data = form.cleaned_data + u_name, pwd = form.save() + + new_user = authenticate(username = u_name, password = pwd) + login(request, new_user) + return my_redirect("/exam/manage/add_quiz") + + else: + return my_render_to_response('exam/add_quiz.html', + {'form':form}, + context_instance=RequestContext(request)) + else: + form = QuizForm() + return my_render_to_response('exam/add_quiz.html', + {'form':form}, + context_instance=RequestContext(request)) def prof_manage(request): return render_to_response('manage.html',{}) diff --git a/testapp/templates/exam/add_quiz.html b/testapp/templates/exam/add_quiz.html index d568b30..a412ecc 100644 --- a/testapp/templates/exam/add_quiz.html +++ b/testapp/templates/exam/add_quiz.html @@ -6,5 +6,22 @@ Add Quiz {% endblock %} {% block manage %} -

Add Quiz + + +

{% endblock %} -- cgit From c20539ed5f879c945cc89323e00daad96047d247 Mon Sep 17 00:00:00 2001 From: jayparikh111 Date: Thu, 16 Feb 2012 13:02:49 +0530 Subject: Form to add New Question --- testapp/exam/forms.py | 19 +++++++++++++++++-- testapp/exam/views.py | 19 +++++++++++++++++-- testapp/templates/exam/add_question.html | 21 +++++++++++++++++++-- 3 files changed, 53 insertions(+), 6 deletions(-) diff --git a/testapp/exam/forms.py b/testapp/exam/forms.py index a867f5f..6d431e7 100644 --- a/testapp/exam/forms.py +++ b/testapp/exam/forms.py @@ -6,6 +6,13 @@ from django.contrib.auth.models import User from string import letters, punctuation, digits import datetime + +QUESTION_TYPE_CHOICES = ( + ("python", "Python"), + ("bash", "Bash"), + ("mcq", "MultipleChoice"), + ) + UNAME_CHARS = letters + "._" + digits PWD_CHARS = letters + punctuation + digits @@ -96,10 +103,18 @@ class UserLoginForm(forms.Form): return user - - class QuizForm(forms.Form): start_date = forms.DateField(initial=datetime.date.today) duration = forms.IntegerField() active = forms.BooleanField(required = False) description = forms.CharField(max_length=256, widget=forms.Textarea(attrs={'cols':20,'rows':2})) + +class AddQuestionForm(forms.Form): + summary = forms.CharField(max_length = 128) + description = forms.CharField(widget = forms.Textarea(attrs={'cols': 20, 'rows': 3})) + points = forms.FloatField() + test = forms.CharField(widget = forms.Textarea(attrs={'cols': 20, 'rows': 3})) + options = forms.CharField(widget = forms.Textarea(attrs={'cols': 20, 'rows': 3})) + type = forms.CharField(max_length=24, widget=forms.Select(choices=QUESTION_TYPE_CHOICES)) + active = forms.BooleanField(required=False) + diff --git a/testapp/exam/views.py b/testapp/exam/views.py index 22e701e..23534f5 100644 --- a/testapp/exam/views.py +++ b/testapp/exam/views.py @@ -14,7 +14,7 @@ from django.db.models import Sum # Local imports. from exam.models import Quiz, Question, QuestionPaper, Profile, Answer, User -from exam.forms import UserRegisterForm, UserLoginForm, QuizForm +from exam.forms import UserRegisterForm, UserLoginForm, QuizForm , AddQuestionForm from exam.xmlrpc_clients import code_server from settings import URL_ROOT @@ -91,7 +91,22 @@ def user_register(request): context_instance=RequestContext(request)) def add_question(request): - return render_to_response('exam/add_question.html',{}) + + if request.method == "POST": + form = AddQuestionForm(request.POST) + if form.is_valid(): + data = form.cleaned_data + return my_redirect("/exam/start/") + + else: + return my_render_to_response('exam/add_question.html', + {'form':form}, + context_instance=RequestContext(request)) + else: + form = AddQuestionForm() + return my_render_to_response('exam/add_question.html', + {'form':form}, + context_instance=RequestContext(request)) def add_quiz(request): diff --git a/testapp/templates/exam/add_question.html b/testapp/templates/exam/add_question.html index fb5d38b..a0ba14d 100644 --- a/testapp/templates/exam/add_question.html +++ b/testapp/templates/exam/add_question.html @@ -1,9 +1,26 @@ {% extends "manage.html" %} -{% block subtitle %} +{% block subtitle %} Add Question {% endblock %} + {% block manage %} -

Add Question + + +

+{% csrf_token %} + +{{ form.as_table }} +

+ + {% endblock %} + -- cgit From 467adb5d403e7dd29a83f44d06c80cdca8b4e7a1 Mon Sep 17 00:00:00 2001 From: jayparikh111 Date: Thu, 16 Feb 2012 15:37:20 +0530 Subject: Form to add New Quiz --- testapp/exam/forms.py | 24 +++++++++++++++++++----- testapp/exam/views.py | 12 ++++-------- testapp/templates/exam/add_question.html | 1 + testapp/templates/exam/add_quiz.html | 3 ++- 4 files changed, 26 insertions(+), 14 deletions(-) diff --git a/testapp/exam/forms.py b/testapp/exam/forms.py index 6d431e7..a09118c 100644 --- a/testapp/exam/forms.py +++ b/testapp/exam/forms.py @@ -1,9 +1,10 @@ from django import forms -from exam.models import Profile +from exam.models import Profile,Quiz from django.contrib.auth import authenticate from django.contrib.auth.models import User + from string import letters, punctuation, digits import datetime @@ -104,10 +105,23 @@ class UserLoginForm(forms.Form): return user class QuizForm(forms.Form): - start_date = forms.DateField(initial=datetime.date.today) - duration = forms.IntegerField() - active = forms.BooleanField(required = False) - description = forms.CharField(max_length=256, widget=forms.Textarea(attrs={'cols':20,'rows':2})) + start_date = forms.DateField(initial=datetime.date.today) + duration = forms.IntegerField() + active = forms.BooleanField(required = False) + description = forms.CharField(max_length=256, widget=forms.Textarea(attrs={'cols':20,'rows':2})) + + def save(self): + start_date = self.cleaned_data["start_date"] + duration = self.cleaned_data["duration"] + active = self.cleaned_data['active'] + description = self.cleaned_data["description"] + + new_quiz = Quiz() + new_quiz.start_date=start_date + new_quiz.duration=duration + new_quiz.active=active + new_quiz.description=description + new_quiz.save(); class AddQuestionForm(forms.Form): summary = forms.CharField(max_length = 128) diff --git a/testapp/exam/views.py b/testapp/exam/views.py index 23534f5..1c5d2e5 100644 --- a/testapp/exam/views.py +++ b/testapp/exam/views.py @@ -109,24 +109,20 @@ def add_question(request): context_instance=RequestContext(request)) def add_quiz(request): - if request.method == "POST": form = QuizForm(request.POST) if form.is_valid(): data = form.cleaned_data - u_name, pwd = form.save() - - new_user = authenticate(username = u_name, password = pwd) - login(request, new_user) - return my_redirect("/exam/manage/add_quiz") + form.save() + return my_redirect("/exam/manage/addquiz") else: - return my_render_to_response('exam/add_quiz.html', + return my_render_to_response('exam/addquiz.html', {'form':form}, context_instance=RequestContext(request)) else: form = QuizForm() - return my_render_to_response('exam/add_quiz.html', + return my_render_to_response('exam/addquiz.html', {'form':form}, context_instance=RequestContext(request)) diff --git a/testapp/templates/exam/add_question.html b/testapp/templates/exam/add_question.html index a0ba14d..ae86ed1 100644 --- a/testapp/templates/exam/add_question.html +++ b/testapp/templates/exam/add_question.html @@ -21,6 +21,7 @@ table th, table td { {{ form.as_table }} + {% endblock %} diff --git a/testapp/templates/exam/add_quiz.html b/testapp/templates/exam/add_quiz.html index a412ecc..80a52ed 100644 --- a/testapp/templates/exam/add_quiz.html +++ b/testapp/templates/exam/add_quiz.html @@ -22,6 +22,7 @@ table th, table td { {{ form.as_table }} - + + {% endblock %} -- cgit From 7df150b5a12f4b96041d9fc79ec24a09a8cf5e4c Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Thu, 16 Feb 2012 15:57:39 +0530 Subject: Form to add a new question --- testapp/exam/forms.py | 23 +++++++++++++++++++++-- testapp/exam/views.py | 3 ++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/testapp/exam/forms.py b/testapp/exam/forms.py index a09118c..f0c515a 100644 --- a/testapp/exam/forms.py +++ b/testapp/exam/forms.py @@ -1,5 +1,5 @@ from django import forms -from exam.models import Profile,Quiz +from exam.models import Profile,Quiz,Question from django.contrib.auth import authenticate from django.contrib.auth.models import User @@ -121,7 +121,7 @@ class QuizForm(forms.Form): new_quiz.duration=duration new_quiz.active=active new_quiz.description=description - new_quiz.save(); + new_quiz.save() class AddQuestionForm(forms.Form): summary = forms.CharField(max_length = 128) @@ -132,3 +132,22 @@ class AddQuestionForm(forms.Form): type = forms.CharField(max_length=24, widget=forms.Select(choices=QUESTION_TYPE_CHOICES)) active = forms.BooleanField(required=False) + def save(self): + summary = self.cleaned_data["summary"] + description = self.cleaned_data["description"] + points = self.cleaned_data['points'] + test = self.cleaned_data["test"] + options = self.cleaned_data['options'] + type = self.cleaned_data["type"] + active = self.cleaned_data["active"] + + new_question = Question() + new_question.summary = summary + new_question.description = description + new_question.points = points + new_question.test = test + new_question.options = options + new_question.type = type + new_question.active = active + new_question.save() + diff --git a/testapp/exam/views.py b/testapp/exam/views.py index 1c5d2e5..0e862ca 100644 --- a/testapp/exam/views.py +++ b/testapp/exam/views.py @@ -96,7 +96,8 @@ def add_question(request): form = AddQuestionForm(request.POST) if form.is_valid(): data = form.cleaned_data - return my_redirect("/exam/start/") + form.save() + return my_redirect("/exam/addquestion/") else: return my_render_to_response('exam/add_question.html', -- cgit From 7dbb5b44622984b064768b84008998555f2f3b0b Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Thu, 16 Feb 2012 16:19:13 +0530 Subject: minor correction in views.py --- testapp/exam/views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testapp/exam/views.py b/testapp/exam/views.py index 0e862ca..2b4a0fe 100644 --- a/testapp/exam/views.py +++ b/testapp/exam/views.py @@ -118,12 +118,12 @@ def add_quiz(request): return my_redirect("/exam/manage/addquiz") else: - return my_render_to_response('exam/addquiz.html', + return my_render_to_response('exam/add_quiz.html', {'form':form}, context_instance=RequestContext(request)) else: form = QuizForm() - return my_render_to_response('exam/addquiz.html', + return my_render_to_response('exam/add_quiz.html', {'form':form}, context_instance=RequestContext(request)) -- cgit From 3cf25b2893bc7b9c7e31240a6e43aedfade68080 Mon Sep 17 00:00:00 2001 From: jayparikh111 Date: Thu, 16 Feb 2012 16:29:06 +0530 Subject: minor correction on views.py --- testapp/exam/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testapp/exam/views.py b/testapp/exam/views.py index 2b4a0fe..7c7a8ad 100644 --- a/testapp/exam/views.py +++ b/testapp/exam/views.py @@ -115,7 +115,7 @@ def add_quiz(request): if form.is_valid(): data = form.cleaned_data form.save() - return my_redirect("/exam/manage/addquiz") + return my_redirect("/exam/addquiz") else: return my_render_to_response('exam/add_quiz.html', -- cgit From cc348af7bed2430dbd1c748138642ea7ecbe09a9 Mon Sep 17 00:00:00 2001 From: jayparikh111 Date: Fri, 17 Feb 2012 12:12:33 +0530 Subject: minor url changes --- testapp/exam/urls.py | 8 ++++---- testapp/exam/views.py | 4 ++-- testapp/templates/manage.html | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/testapp/exam/urls.py b/testapp/exam/urls.py index 4545897..8fa9a36 100644 --- a/testapp/exam/urls.py +++ b/testapp/exam/urls.py @@ -4,14 +4,14 @@ urlpatterns = patterns('exam.views', url(r'^$', 'index'), url(r'^login/$', 'user_login'), url(r'^manage/$', 'prof_manage'), - url(r'^addquestion/$', 'add_question'), - url(r'^addquiz/$', 'add_quiz'), - url(r'^grade_user/$', 'show_all_users'), + url(r'^manage/addquestion/$', 'add_question'), + url(r'^manage/addquiz/$', 'add_quiz'), + url(r'^manage/gradeuser/$', 'show_all_users'), url(r'^register/$', 'user_register'), url(r'^start/$', 'start'), url(r'^quit/$', 'quit'), url(r'^complete/$', 'complete'), - url(r'^monitor/$', 'monitor'), + url(r'^manage/monitor/$', 'monitor'), url(r'^monitor/(?P\d+)/$', 'monitor'), url(r'^user_data/(?P[a-zA-Z0-9_.]+)/$', 'user_data'), url(r'^grade_user/(?P[a-zA-Z0-9_.]+)/$', 'grade_user'), diff --git a/testapp/exam/views.py b/testapp/exam/views.py index 7c7a8ad..b202ff3 100644 --- a/testapp/exam/views.py +++ b/testapp/exam/views.py @@ -97,7 +97,7 @@ def add_question(request): if form.is_valid(): data = form.cleaned_data form.save() - return my_redirect("/exam/addquestion/") + return my_redirect("/exam/manage/addquestion/") else: return my_render_to_response('exam/add_question.html', @@ -115,7 +115,7 @@ def add_quiz(request): if form.is_valid(): data = form.cleaned_data form.save() - return my_redirect("/exam/addquiz") + return my_redirect("/exam/manage/addquiz") else: return my_render_to_response('exam/add_quiz.html', diff --git a/testapp/templates/manage.html b/testapp/templates/manage.html index 3b67999..58b19ef 100644 --- a/testapp/templates/manage.html +++ b/testapp/templates/manage.html @@ -9,10 +9,10 @@

Manage

-- cgit From 44ae45331c5ec81a7a7c4ed6f6d88f67f41be909 Mon Sep 17 00:00:00 2001 From: jayparikh111 Date: Fri, 17 Feb 2012 12:32:40 +0530 Subject: Minor changes for Resolution settings --- testapp/templates/manage.html | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/testapp/templates/manage.html b/testapp/templates/manage.html index 58b19ef..c8b0b99 100644 --- a/testapp/templates/manage.html +++ b/testapp/templates/manage.html @@ -4,20 +4,6 @@ {% block content %} -

- -

{% block subtitle %} {% endblock %}

{% block manage %} {% endblock %}

+ + +

Manage

-- cgit From e8ba4ba5301a805194a555f52275407f045b91ab Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Mon, 20 Feb 2012 19:51:32 +0530 Subject: New file to manage questions --- testapp/templates/exam/showquestions.html | 35 +++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 testapp/templates/exam/showquestions.html diff --git a/testapp/templates/exam/showquestions.html b/testapp/templates/exam/showquestions.html new file mode 100644 index 0000000..38d4bcc --- /dev/null +++ b/testapp/templates/exam/showquestions.html @@ -0,0 +1,35 @@ +{% extends "manage.html" %} + + +{% block subtitle %} +List of Questions +{% endblock %} + +{% block script %} + +{% endblock %} + +{% block manage %} + +{% endblock %} -- cgit From f6a90c1eb603c9f3b8178102e387025880c0a5ac Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Mon, 20 Feb 2012 19:51:58 +0530 Subject: changes to manage questions --- testapp/exam/urls.py | 1 + testapp/exam/views.py | 62 +++++++++++++++++++++++--------- testapp/templates/exam/add_question.html | 2 +- testapp/templates/exam/grade_user.html | 6 ++-- testapp/templates/exam/monitor.html | 2 +- testapp/templates/exam/showusers.html | 3 +- testapp/templates/exam/user_data.html | 8 ++--- testapp/templates/manage.html | 4 +-- 8 files changed, 59 insertions(+), 29 deletions(-) diff --git a/testapp/exam/urls.py b/testapp/exam/urls.py index 72c93fa..504a4e6 100644 --- a/testapp/exam/urls.py +++ b/testapp/exam/urls.py @@ -7,6 +7,7 @@ urlpatterns = patterns('exam.views', url(r'^manage/addquestion/$', 'add_question'), url(r'^manage/addquiz/$', 'add_quiz'), url(r'^manage/gradeuser/$', 'show_all_users'), + url(r'^manage/questions/$', 'show_all_questions'), url(r'^register/$', 'user_register'), url(r'^start/$', 'start'), url(r'^quit/$', 'quit'), diff --git a/testapp/exam/views.py b/testapp/exam/views.py index b202ff3..b8233b2 100644 --- a/testapp/exam/views.py +++ b/testapp/exam/views.py @@ -91,23 +91,23 @@ def user_register(request): context_instance=RequestContext(request)) def add_question(request): - - if request.method == "POST": - form = AddQuestionForm(request.POST) - if form.is_valid(): - data = form.cleaned_data - form.save() - return my_redirect("/exam/manage/addquestion/") - - else: - return my_render_to_response('exam/add_question.html', - {'form':form}, - context_instance=RequestContext(request)) - else: - form = AddQuestionForm() - return my_render_to_response('exam/add_question.html', - {'form':form}, - context_instance=RequestContext(request)) + + if request.method == "POST": + form = AddQuestionForm(request.POST) + if form.is_valid(): + data = form.cleaned_data + form.save() + return my_redirect("/exam/manage/questions/") + + else: + return my_render_to_response('exam/add_question.html', + {'form':form}, + context_instance=RequestContext(request)) + else: + form = AddQuestionForm() + return my_render_to_response('exam/add_question.html', + {'form':form}, + context_instance=RequestContext(request)) def add_quiz(request): if request.method == "POST": @@ -355,6 +355,34 @@ def show_all_users(request): print context return my_render_to_response('exam/showusers.html',context,context_instance=RequestContext(request)) +def show_all_questions(request): + if request.method == 'POST': + data = request.POST.getlist('question') + if data == None: + questions = Question.objects.all() + context = {'papers': [], + 'question': None, + 'questions':questions} + return my_render_to_response('exam/showquestions.html', context, + context_instance=RequestContext(request)) + for i in data: + question = Question.objects.get(id=i).delete() + questions = Question.objects.all() + context = {'papers': [], + 'question': None, + 'questions':questions} + return my_render_to_response('exam/showquestions.html', context, + context_instance=RequestContext(request)) + + else: + """Show the list of available quiz""" + questions = Question.objects.all() + context = {'papers': [], + 'question': None, + 'questions':questions} + return my_render_to_response('exam/showquestions.html', context, + context_instance=RequestContext(request)) + def user_data(request, username): """Render user data.""" current_user = request.user diff --git a/testapp/templates/exam/add_question.html b/testapp/templates/exam/add_question.html index ae86ed1..2d42b34 100644 --- a/testapp/templates/exam/add_question.html +++ b/testapp/templates/exam/add_question.html @@ -21,7 +21,7 @@ table th, table td { {{ form.as_table }} - + {% endblock %} diff --git a/testapp/templates/exam/grade_user.html b/testapp/templates/exam/grade_user.html index fa0e516..bad1765 100644 --- a/testapp/templates/exam/grade_user.html +++ b/testapp/templates/exam/grade_user.html @@ -32,7 +32,7 @@ Start time: {{ paper.start_time }}
{% if paper.answers.count %}

Answers

+ action="{{URL_ROOT}}/exam/manage/grade_user/{{data.user.username}}/" method="post"> {% csrf_token %} {% for question, answers in paper.get_question_answers.items %}

@@ -71,11 +71,11 @@ Marks: 1 %} - + Monitor quiz {% else %} {% with data.papers.0 as paper %} - + Monitor quiz {% endwith %} {% endif %} diff --git a/testapp/templates/exam/monitor.html b/testapp/templates/exam/monitor.html index 4847545..a802de2 100644 --- a/testapp/templates/exam/monitor.html +++ b/testapp/templates/exam/monitor.html @@ -20,7 +20,7 @@

{% for quiz in quizzes %} -
{{ quiz.description }}
+
{{ quiz.description }}
{% endfor %}

{% endif %} diff --git a/testapp/templates/exam/showusers.html b/testapp/templates/exam/showusers.html index ad9534f..038cb8b 100644 --- a/testapp/templates/exam/showusers.html +++ b/testapp/templates/exam/showusers.html @@ -5,8 +5,9 @@ List of Users {% endblock %} + {% block manage %} {% for name in user %} -{{ name }}
+{{ name }}
{% endfor %} {% endblock %} diff --git a/testapp/templates/exam/user_data.html b/testapp/templates/exam/user_data.html index b9cbbb5..c835f61 100644 --- a/testapp/templates/exam/user_data.html +++ b/testapp/templates/exam/user_data.html @@ -30,7 +30,7 @@ Last login: {{ data.user.last_login }}
{% if data.papers %} -
+
Grade/correct paper
@@ -75,15 +75,15 @@ User IP address: {{ paper.user_ip }} {% endif %} {# if data.papers #}

- + Grade/correct paper
{% if data.papers.count > 1 %} - + Monitor quiz {% else %} {% with data.papers.0 as paper %} - + Monitor quiz {% endwith %} {% endif %} diff --git a/testapp/templates/manage.html b/testapp/templates/manage.html index c757523..a21e8c4 100644 --- a/testapp/templates/manage.html +++ b/testapp/templates/manage.html @@ -25,8 +25,8 @@

Manage

-
Add Questions
-
Add Quiz
+
Questions
+
Quizzes

Grade User

Monitor

-- cgit From c61396a219efb3b078094d028e41fe51bc857fe3 Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Mon, 20 Feb 2012 20:28:51 +0530 Subject: new file to manage quiz --- testapp/templates/exam/show_quiz.html | 46 +++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 testapp/templates/exam/show_quiz.html diff --git a/testapp/templates/exam/show_quiz.html b/testapp/templates/exam/show_quiz.html new file mode 100644 index 0000000..a113953 --- /dev/null +++ b/testapp/templates/exam/show_quiz.html @@ -0,0 +1,46 @@ +{% extends "manage.html" %} + +{% block title %} Quiz List {% endblock title %} + +{% block script %} + +{% endblock %} + +{% block manage %} +{% if not quizzes and not quiz %} +
Available Quiz
+ +
No quizzes available.
+ +{% endif %} + +{# ############################################################### #} +{# This is rendered when we are just viewing exam/monitor #} +{% if quizzes %} +
List of Quizzes
+ +{% csrf_token %} +{% for quiz in quizzes %} + +  {{ quiz.description }}
+{% endfor %} +

+   + +{% endif %} +{% endblock %} -- cgit From ddb7f4e07771f4e4ca514c253d671698e1b74020 Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Mon, 20 Feb 2012 20:29:06 +0530 Subject: changes to manage quiz --- testapp/exam/urls.py | 2 ++ testapp/exam/views.py | 31 ++++++++++++++++++++++++++++++- testapp/templates/exam/add_quiz.html | 2 +- testapp/templates/manage.html | 2 +- 4 files changed, 34 insertions(+), 3 deletions(-) diff --git a/testapp/exam/urls.py b/testapp/exam/urls.py index 504a4e6..772a2f3 100644 --- a/testapp/exam/urls.py +++ b/testapp/exam/urls.py @@ -8,6 +8,7 @@ urlpatterns = patterns('exam.views', url(r'^manage/addquiz/$', 'add_quiz'), url(r'^manage/gradeuser/$', 'show_all_users'), url(r'^manage/questions/$', 'show_all_questions'), + url(r'^manage/showquiz/$','show_all_quiz'), url(r'^register/$', 'user_register'), url(r'^start/$', 'start'), url(r'^quit/$', 'quit'), @@ -19,3 +20,4 @@ urlpatterns = patterns('exam.views', url(r'^(?P\d+)/$', 'question'), url(r'^(?P\d+)/check/$', 'check'), ) + diff --git a/testapp/exam/views.py b/testapp/exam/views.py index b8233b2..6dd5fb4 100644 --- a/testapp/exam/views.py +++ b/testapp/exam/views.py @@ -115,7 +115,7 @@ def add_quiz(request): if form.is_valid(): data = form.cleaned_data form.save() - return my_redirect("/exam/manage/addquiz") + return my_redirect("/exam/manage/showquiz") else: return my_render_to_response('exam/add_quiz.html', @@ -355,6 +355,35 @@ def show_all_users(request): print context return my_render_to_response('exam/showusers.html',context,context_instance=RequestContext(request)) +def show_all_quiz(request): + if request.method == 'POST': + data = request.POST.getlist('quiz') + if data == None: + quizzes = Quiz.objects.all() + context = {'papers': [], + 'quiz': None, + 'quizzes':quizzes} + return my_render_to_response('exam/show_quiz.html', context, + context_instance=RequestContext(request)) + for i in data: + quiz = Quiz.objects.get(id=i).delete() + quizzes = Quiz.objects.all() + context = {'papers': [], + 'quiz': None, + 'quizzes':quizzes} + return my_render_to_response('exam/show_quiz.html', context, + context_instance=RequestContext(request)) + + else: + """Show the list of available quiz""" + quizzes = Quiz.objects.all() + context = {'papers': [], + 'quiz': None, + 'quizzes':quizzes} + return my_render_to_response('exam/show_quiz.html', context, + context_instance=RequestContext(request)) + + def show_all_questions(request): if request.method == 'POST': data = request.POST.getlist('question') diff --git a/testapp/templates/exam/add_quiz.html b/testapp/templates/exam/add_quiz.html index 80a52ed..d51d129 100644 --- a/testapp/templates/exam/add_quiz.html +++ b/testapp/templates/exam/add_quiz.html @@ -23,6 +23,6 @@ table th, table td { - + {% endblock %} diff --git a/testapp/templates/manage.html b/testapp/templates/manage.html index a21e8c4..0cc47ae 100644 --- a/testapp/templates/manage.html +++ b/testapp/templates/manage.html @@ -26,7 +26,7 @@
Manage

Questions
-
Quizzes
+
Quizzes

Grade User

Monitor

-- cgit From 6b608e174fbd9367c9453f7933b69a35516811d2 Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Tue, 21 Feb 2012 11:35:56 +0530 Subject: add docstrings to each view in views.py --- testapp/exam/views.py | 28 ++++++++++++++++++++++++---- testapp/templates/exam/show_quiz.html | 6 ++---- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/testapp/exam/views.py b/testapp/exam/views.py index 6dd5fb4..80632d8 100644 --- a/testapp/exam/views.py +++ b/testapp/exam/views.py @@ -91,7 +91,8 @@ def user_register(request): context_instance=RequestContext(request)) def add_question(request): - + """To add a new question in the database. Create a new question and store it.""" + if request.method == "POST": form = AddQuestionForm(request.POST) if form.is_valid(): @@ -110,6 +111,8 @@ def add_question(request): context_instance=RequestContext(request)) def add_quiz(request): + """To add a new quiz. Create a new quiz and store it in the database.""" + if request.method == "POST": form = QuizForm(request.POST) if form.is_valid(): @@ -128,6 +131,8 @@ def add_quiz(request): context_instance=RequestContext(request)) def prof_manage(request): + """Take credentials of the user with professor/moderator rights/permissions and log in.""" + return render_to_response('manage.html',{}) def user_login(request): @@ -154,6 +159,8 @@ def user_login(request): context_instance=RequestContext(request)) def start(request): + """Check the user cedentials and if any quiz is available, start the exam.""" + user = request.user try: # Right now the app is designed so there is only one active quiz @@ -196,6 +203,8 @@ def start(request): context_instance=ci) def question(request, q_id): + """Check the credentials of the user and start the exam.""" + user = request.user if not user.is_authenticated(): return my_redirect('/exam/login/') @@ -227,6 +236,8 @@ def show_question(request, q_id): return question(request, q_id) def check(request, q_id): + + user = request.user if not user.is_authenticated(): return my_redirect('/exam/login/') @@ -287,10 +298,13 @@ def check(request, q_id): return show_question(request, next_q) def quit(request): - + """Show the quit page when the user logs out.""" + return my_render_to_response('exam/quit.html',context_instance=RequestContext(request)) def complete(request,reason = None): + """Show a page to inform user that the quiz has been compeleted.""" + user = request.user no = False message = reason or 'The quiz has been completed. Thank you.' @@ -305,6 +319,7 @@ def complete(request,reason = None): return my_redirect('/exam/') def monitor(request, quiz_id=None): + """Monitor the progress of the papers taken so far.""" user = request.user if not user.is_authenticated() and not user.is_staff: @@ -350,12 +365,16 @@ def get_user_data(username): return data def show_all_users(request): + """Shows all the users who have taken various exams/quiz.""" + user = User.objects.filter(username__contains="") context = { 'user':user } print context return my_render_to_response('exam/showusers.html',context,context_instance=RequestContext(request)) def show_all_quiz(request): + """Generates a list of all the quizzes that are currently in the database.""" + if request.method == 'POST': data = request.POST.getlist('quiz') if data == None: @@ -375,7 +394,6 @@ def show_all_quiz(request): context_instance=RequestContext(request)) else: - """Show the list of available quiz""" quizzes = Quiz.objects.all() context = {'papers': [], 'quiz': None, @@ -385,6 +403,8 @@ def show_all_quiz(request): def show_all_questions(request): + """Show a list of all the questions currently in the databse.""" + if request.method == 'POST': data = request.POST.getlist('question') if data == None: @@ -404,7 +424,7 @@ def show_all_questions(request): context_instance=RequestContext(request)) else: - """Show the list of available quiz""" + questions = Question.objects.all() context = {'papers': [], 'question': None, diff --git a/testapp/templates/exam/show_quiz.html b/testapp/templates/exam/show_quiz.html index a113953..bbea77f 100644 --- a/testapp/templates/exam/show_quiz.html +++ b/testapp/templates/exam/show_quiz.html @@ -23,16 +23,14 @@ function my_confirm(frm) {% block manage %} {% if not quizzes and not quiz %} -
Available Quiz
- +
Available Quiz

No quizzes available.
- {% endif %} {# ############################################################### #} {# This is rendered when we are just viewing exam/monitor #} {% if quizzes %} -
List of Quizzes
+
Quiz List

{% csrf_token %} {% for quiz in quizzes %} -- cgit From 2b6b595ca8652696ab9059add8ea54661cab5f31 Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Tue, 21 Feb 2012 12:38:38 +0530 Subject: views for editing quiz and questions --- testapp/exam/forms.py | 2 +- testapp/exam/urls.py | 2 + testapp/exam/views.py | 106 ++++++++++++++++++++++-------- testapp/templates/exam/show_quiz.html | 2 +- testapp/templates/exam/showquestions.html | 2 +- 5 files changed, 83 insertions(+), 31 deletions(-) diff --git a/testapp/exam/forms.py b/testapp/exam/forms.py index f0c515a..1788a08 100644 --- a/testapp/exam/forms.py +++ b/testapp/exam/forms.py @@ -123,7 +123,7 @@ class QuizForm(forms.Form): new_quiz.description=description new_quiz.save() -class AddQuestionForm(forms.Form): +class QuestionForm(forms.Form): summary = forms.CharField(max_length = 128) description = forms.CharField(widget = forms.Textarea(attrs={'cols': 20, 'rows': 3})) points = forms.FloatField() diff --git a/testapp/exam/urls.py b/testapp/exam/urls.py index 772a2f3..2187e58 100644 --- a/testapp/exam/urls.py +++ b/testapp/exam/urls.py @@ -5,7 +5,9 @@ urlpatterns = patterns('exam.views', url(r'^login/$', 'user_login'), url(r'^manage/$', 'prof_manage'), url(r'^manage/addquestion/$', 'add_question'), + url(r'^manage/addquestion/(?P\d+)/$', 'add_question'), url(r'^manage/addquiz/$', 'add_quiz'), + url(r'^manage/addquiz/(?P\d+)/$', 'add_quiz'), url(r'^manage/gradeuser/$', 'show_all_users'), url(r'^manage/questions/$', 'show_all_questions'), url(r'^manage/showquiz/$','show_all_quiz'), diff --git a/testapp/exam/views.py b/testapp/exam/views.py index 80632d8..c2296f3 100644 --- a/testapp/exam/views.py +++ b/testapp/exam/views.py @@ -14,7 +14,7 @@ from django.db.models import Sum # Local imports. from exam.models import Quiz, Question, QuestionPaper, Profile, Answer, User -from exam.forms import UserRegisterForm, UserLoginForm, QuizForm , AddQuestionForm +from exam.forms import UserRegisterForm, UserLoginForm, QuizForm , QuestionForm from exam.xmlrpc_clients import code_server from settings import URL_ROOT @@ -90,45 +90,95 @@ def user_register(request): {'form':form}, context_instance=RequestContext(request)) -def add_question(request): - """To add a new question in the database. Create a new question and store it.""" - - if request.method == "POST": - form = AddQuestionForm(request.POST) - if form.is_valid(): - data = form.cleaned_data - form.save() - return my_redirect("/exam/manage/questions/") - - else: - return my_render_to_response('exam/add_question.html', - {'form':form}, - context_instance=RequestContext(request)) - else: - form = AddQuestionForm() - return my_render_to_response('exam/add_question.html', - {'form':form}, - context_instance=RequestContext(request)) - -def add_quiz(request): - """To add a new quiz. Create a new quiz and store it in the database.""" +def add_question(request,question_id=None): + """To add a new question in the database. Create a new question and store it.""" if request.method == "POST": - form = QuizForm(request.POST) + form = QuestionForm(request.POST) if form.is_valid(): data = form.cleaned_data - form.save() - return my_redirect("/exam/manage/showquiz") + if question_id == None: + form.save() + return my_redirect("/exam/manage/questions") + else: + d = Question.objects.get(id=question_id) + d.summary = form['summary'].data + d.description = form['description'].data + d.points = form['points'].data + d.test = form['test'].data + d.options = form['options'].data + d.type = form['type'].data + d.active = form['active'].data + d.save() + return my_redirect("/exam/manage/questions") + + else: + return my_render_to_response('exam/add_question.html', + {'form':form}, + context_instance=RequestContext(request)) + else: + if question_id == None: + form = QuestionForm() + return my_render_to_response('exam/add_question.html', + {'form':form}, + context_instance=RequestContext(request)) + else: + + d = Question.objects.get(id=question_id) + form = QuestionForm() + form.initial['summary']= d.summary + form.initial['description'] = d.description + form.initial['points']= d.points + form.initial['test'] = d.test + form.initial['options'] = d.options + form.initial['type'] = d.type + form.initial['active'] = d.active + + return my_render_to_response('exam/add_question.html', + {'form':form}, + context_instance=RequestContext(request)) + + +def add_quiz(request,quiz_id=None): + if request.method == "POST": + form = QuizForm(request.POST) + if form.is_valid(): + data = form.cleaned_data + if quiz_id == None: + form.save() + return my_redirect("/exam/manage/showquiz") + else: + d = Quiz.objects.get(id=quiz_id) + d.start_date = form['start_date'].data + d.duration = form['duration'].data + d.active = form['active'].data + d.description = form['description'].data + d.save() + return my_redirect("/exam/manage/showquiz") else: return my_render_to_response('exam/add_quiz.html', {'form':form}, context_instance=RequestContext(request)) else: - form = QuizForm() - return my_render_to_response('exam/add_quiz.html', + if quiz_id == None: + form = QuizForm() + return my_render_to_response('exam/add_quiz.html', {'form':form}, context_instance=RequestContext(request)) + else: + + d = Quiz.objects.get(id=quiz_id) + form = QuizForm() + form.initial['start_date']= d.start_date + form.initial['duration'] = d.duration + form.initial['description']= d.description + form.initial['active'] = d.active + + return my_render_to_response('exam/add_quiz.html', + {'form':form}, + context_instance=RequestContext(request)) + def prof_manage(request): """Take credentials of the user with professor/moderator rights/permissions and log in.""" diff --git a/testapp/templates/exam/show_quiz.html b/testapp/templates/exam/show_quiz.html index bbea77f..2e9059d 100644 --- a/testapp/templates/exam/show_quiz.html +++ b/testapp/templates/exam/show_quiz.html @@ -35,7 +35,7 @@ function my_confirm(frm) {% csrf_token %} {% for quiz in quizzes %} -  {{ quiz.description }}
+  {{ quiz.description }}
{% endfor %}

   diff --git a/testapp/templates/exam/showquestions.html b/testapp/templates/exam/showquestions.html index 38d4bcc..994ca26 100644 --- a/testapp/templates/exam/showquestions.html +++ b/testapp/templates/exam/showquestions.html @@ -26,7 +26,7 @@ function my_confirm(frm) {% csrf_token %} {% for i in questions %} -  {{ i }}
+  {{ i }}
{% endfor %}
   -- cgit From f2d65592affd34bc60cf4a3a2c72de1d84c934c0 Mon Sep 17 00:00:00 2001 From: jayparikh111 Date: Wed, 22 Feb 2012 16:02:07 +0530 Subject: Changes related to Authentication of Moderator --- testapp/exam/urls.py | 21 +++++----- testapp/exam/views.py | 76 ++++++++++++++++++++++------------- testapp/templates/exam/monitor.html | 4 +- testapp/templates/exam/show_quiz.html | 1 + testapp/templates/exam/showusers.html | 2 +- testapp/templates/manage.html | 4 +- 6 files changed, 68 insertions(+), 40 deletions(-) diff --git a/testapp/exam/urls.py b/testapp/exam/urls.py index 2187e58..d4ebe50 100644 --- a/testapp/exam/urls.py +++ b/testapp/exam/urls.py @@ -3,23 +3,26 @@ from django.conf.urls.defaults import patterns, include, url urlpatterns = patterns('exam.views', url(r'^$', 'index'), url(r'^login/$', 'user_login'), + url(r'^start/$', 'start'), + url(r'^quit/$', 'quit'), + url(r'^complete/$', 'complete'), + url(r'^register/$', 'user_register'), + url(r'^(?P\d+)/$', 'question'), + url(r'^(?P\d+)/check/$', 'check'), + url(r'^manage/$', 'prof_manage'), url(r'^manage/addquestion/$', 'add_question'), url(r'^manage/addquestion/(?P\d+)/$', 'add_question'), url(r'^manage/addquiz/$', 'add_quiz'), url(r'^manage/addquiz/(?P\d+)/$', 'add_quiz'), url(r'^manage/gradeuser/$', 'show_all_users'), + url(r'^manage/gradeuser/(?P[a-zA-Z0-9_.]+)/$', 'grade_user'), url(r'^manage/questions/$', 'show_all_questions'), - url(r'^manage/showquiz/$','show_all_quiz'), - url(r'^register/$', 'user_register'), - url(r'^start/$', 'start'), - url(r'^quit/$', 'quit'), - url(r'^complete/$', 'complete'), + url(r'^manage/showquiz/$','show_all_quiz'), url(r'^manage/monitor/$', 'monitor'), url(r'^manage/monitor/(?P\d+)/$', 'monitor'), - url(r'^user_data/(?P[a-zA-Z0-9_.]+)/$', 'user_data'), - url(r'^manage/grade_user/(?P[a-zA-Z0-9_.]+)/$', 'grade_user'), - url(r'^(?P\d+)/$', 'question'), - url(r'^(?P\d+)/check/$', 'check'), + url(r'^manage/user_data/(?P[a-zA-Z0-9_.]+)/$', 'user_data'), + + ) diff --git a/testapp/exam/views.py b/testapp/exam/views.py index c2296f3..bc2290b 100644 --- a/testapp/exam/views.py +++ b/testapp/exam/views.py @@ -58,6 +58,8 @@ def index(request): """ user = request.user if user.is_authenticated(): + if user.groups.filter(name='moderator').count() > 0: + return my_redirect('/exam/manage/') return my_redirect("/exam/start/") return my_redirect("/exam/login/") @@ -92,7 +94,9 @@ def user_register(request): def add_question(request,question_id=None): """To add a new question in the database. Create a new question and store it.""" - + user = request.user + if not user.is_authenticated() or user.groups.filter(name='moderator').count() == 0 : + raise Http404('You are not allowed to view this page!') if request.method == "POST": form = QuestionForm(request.POST) if form.is_valid(): @@ -140,6 +144,9 @@ def add_question(request,question_id=None): def add_quiz(request,quiz_id=None): + user = request.user + if not user.is_authenticated() or user.groups.filter(name='moderator').count() == 0 : + raise Http404('You are not allowed to view this page!') if request.method == "POST": form = QuizForm(request.POST) if form.is_valid(): @@ -182,14 +189,18 @@ def add_quiz(request,quiz_id=None): def prof_manage(request): """Take credentials of the user with professor/moderator rights/permissions and log in.""" - - return render_to_response('manage.html',{}) + user = request.user + if user.is_authenticated() and user.groups.filter(name='moderator').count() > 0: + return render_to_response('manage.html',{}) + return my_redirect('/exam/login/') def user_login(request): """Take the credentials of the user and log the user in.""" user = request.user if user.is_authenticated(): + if user.groups.filter(name='moderator').count() > 0 : + return my_redirect('/exam/manage/') return my_redirect("/exam/start/") if request.method == "POST": @@ -197,7 +208,9 @@ def user_login(request): if form.is_valid(): user = form.cleaned_data login(request, user) - return my_redirect("/exam/start/") + if user.groups.filter(name='moderator').count() > 0 : + return my_redirect('/exam/manage/') + return my_redirect('/exam/start/') else: context = {"form": form} return my_render_to_response('exam/login.html', context, @@ -358,6 +371,8 @@ def complete(request,reason = None): user = request.user no = False message = reason or 'The quiz has been completed. Thank you.' + if user.groups.filter(name='moderator').count() > 0: + message = 'You are successfully Logged out. Thanks for spending some time with the application' if request.method == 'POST' and 'no' in request.POST: no = True if not no: @@ -372,7 +387,7 @@ def monitor(request, quiz_id=None): """Monitor the progress of the papers taken so far.""" user = request.user - if not user.is_authenticated() and not user.is_staff: + if not user.is_authenticated() or user.groups.filter(name='moderator').count() == 0: raise Http404('You are not allowed to view this page!') if quiz_id is None: @@ -416,7 +431,9 @@ def get_user_data(username): def show_all_users(request): """Shows all the users who have taken various exams/quiz.""" - + user = request.user + if not user.is_authenticated() or user.groups.filter(name='moderator').count() == 0: + raise Http404('You are not allowed to view this page !') user = User.objects.filter(username__contains="") context = { 'user':user } print context @@ -424,6 +441,9 @@ def show_all_users(request): def show_all_quiz(request): """Generates a list of all the quizzes that are currently in the database.""" + user = request.user + if not user.is_authenticated() or user.groups.filter(name='moderator').count() == 0: + raise Http404('You are not allowed to view this page !') if request.method == 'POST': data = request.POST.getlist('quiz') @@ -453,39 +473,41 @@ def show_all_quiz(request): def show_all_questions(request): - """Show a list of all the questions currently in the databse.""" + """Show a list of all the questions currently in the databse.""" + user = request.user + if not user.is_authenticated() or user.groups.filter(name='moderator').count() == 0 : + raise Http404("You are not allowed to view this page !") - if request.method == 'POST': - data = request.POST.getlist('question') - if data == None: - questions = Question.objects.all() - context = {'papers': [], - 'question': None, - 'questions':questions} - return my_render_to_response('exam/showquestions.html', context, + if request.method == 'POST': + data = request.POST.getlist('question') + if data == None: + questions = Question.objects.all() + context = {'papers': [], + 'question': None, + 'questions':questions} + return my_render_to_response('exam/showquestions.html', context, context_instance=RequestContext(request)) - for i in data: - question = Question.objects.get(id=i).delete() - questions = Question.objects.all() - context = {'papers': [], + for i in data: + question = Question.objects.get(id=i).delete() + questions = Question.objects.all() + context = {'papers': [], 'question': None, 'questions':questions} - return my_render_to_response('exam/showquestions.html', context, + return my_render_to_response('exam/showquestions.html', context, context_instance=RequestContext(request)) - else: - - questions = Question.objects.all() - context = {'papers': [], + else: + questions = Question.objects.all() + context = {'papers': [], 'question': None, 'questions':questions} - return my_render_to_response('exam/showquestions.html', context, + return my_render_to_response('exam/showquestions.html', context, context_instance=RequestContext(request)) def user_data(request, username): """Render user data.""" current_user = request.user - if not current_user.is_authenticated() and not current_user.is_staff: + if not current_user.is_authenticated() or current_user.groups.filter(name='moderator').count() == 0: raise Http404('You are not allowed to view this page!') data = get_user_data(username) @@ -499,7 +521,7 @@ def grade_user(request, username): and update all their marks and also give comments for each paper. """ current_user = request.user - if not current_user.is_authenticated() and not current_user.is_staff: + if not current_user.is_authenticated() or current_user.groups.filter(name='moderator').count() == 0: raise Http404('You are not allowed to view this page!') data = get_user_data(username) diff --git a/testapp/templates/exam/monitor.html b/testapp/templates/exam/monitor.html index a802de2..60814c7 100644 --- a/testapp/templates/exam/monitor.html +++ b/testapp/templates/exam/monitor.html @@ -55,9 +55,9 @@ table tbody th { {% for paper in papers %} - + {{ paper.user.get_full_name.title }} - + {{ paper.user.username }} {{ paper.profile.roll_number }} {{ paper.profile.institute }} diff --git a/testapp/templates/exam/show_quiz.html b/testapp/templates/exam/show_quiz.html index 2e9059d..001b2fe 100644 --- a/testapp/templates/exam/show_quiz.html +++ b/testapp/templates/exam/show_quiz.html @@ -33,6 +33,7 @@ function my_confirm(frm)
Quiz List
{% csrf_token %} + {% for quiz in quizzes %}   {{ quiz.description }}
diff --git a/testapp/templates/exam/showusers.html b/testapp/templates/exam/showusers.html index 038cb8b..441b921 100644 --- a/testapp/templates/exam/showusers.html +++ b/testapp/templates/exam/showusers.html @@ -8,6 +8,6 @@ List of Users {% block manage %} {% for name in user %} -{{ name }}
+{{ name }}
{% endfor %} {% endblock %} diff --git a/testapp/templates/manage.html b/testapp/templates/manage.html index 0cc47ae..c7c6fa1 100644 --- a/testapp/templates/manage.html +++ b/testapp/templates/manage.html @@ -7,7 +7,9 @@

-
Online Test
+ Online Test + +

-- cgit From 9acff5f2cf9f9ae3d2fc097e1fcd84712d3199d0 Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Thu, 23 Feb 2012 16:30:36 +0530 Subject: more changes to edit multiple questions at a time --- testapp/exam/urls.py | 1 + testapp/exam/views.py | 59 +++++++++++++++++++++++++++++-- testapp/static/exam/css/base.css | 2 +- testapp/templates/exam/edit_question.html | 29 +++++++++++++++ testapp/templates/exam/showquestions.html | 18 ++++++++-- testapp/templates/manage.html | 6 +++- 6 files changed, 109 insertions(+), 6 deletions(-) create mode 100644 testapp/templates/exam/edit_question.html diff --git a/testapp/exam/urls.py b/testapp/exam/urls.py index d4ebe50..67debd2 100644 --- a/testapp/exam/urls.py +++ b/testapp/exam/urls.py @@ -14,6 +14,7 @@ urlpatterns = patterns('exam.views', url(r'^manage/addquestion/$', 'add_question'), url(r'^manage/addquestion/(?P\d+)/$', 'add_question'), url(r'^manage/addquiz/$', 'add_quiz'), + url(r'^manage/editquestion/$', 'edit_question'), url(r'^manage/addquiz/(?P\d+)/$', 'add_quiz'), url(r'^manage/gradeuser/$', 'show_all_users'), url(r'^manage/gradeuser/(?P[a-zA-Z0-9_.]+)/$', 'grade_user'), diff --git a/testapp/exam/views.py b/testapp/exam/views.py index bc2290b..22151e7 100644 --- a/testapp/exam/views.py +++ b/testapp/exam/views.py @@ -92,6 +92,33 @@ def user_register(request): {'form':form}, context_instance=RequestContext(request)) +def edit_question(request): + user = request.user + if not user.is_authenticated() or user.groups.filter(name='moderator').count() == 0 : + raise Http404('You are not allowed to view this page!') + + summary = request.POST.getlist('summary') + description = request.POST.getlist('description') + points = request.POST.getlist('points') + test = request.POST.getlist('test') + options = request.POST.getlist('options') + type = request.POST.getlist('type') + active = request.POST.getlist('active') + j = 0 + for i in editquestionlist: + question = Question.objects.get(id=i) + question.summary = summary[j] + question.description = description[j] + question.points = points[j] + question.test = test[j] + question.options = options[j] + question.type = type[j] + question.active = active[j] + question.save() + j += 1 + return my_redirect("/exam/manage/questions") + + def add_question(request,question_id=None): """To add a new question in the database. Create a new question and store it.""" user = request.user @@ -478,7 +505,7 @@ def show_all_questions(request): if not user.is_authenticated() or user.groups.filter(name='moderator').count() == 0 : raise Http404("You are not allowed to view this page !") - if request.method == 'POST': + if request.method == 'POST' and request.POST.get('delete')=='delete': data = request.POST.getlist('question') if data == None: questions = Question.objects.all() @@ -495,7 +522,35 @@ def show_all_questions(request): 'questions':questions} return my_render_to_response('exam/showquestions.html', context, context_instance=RequestContext(request)) - + + elif request.method == 'POST' and request.POST.get('edit')=='edit': + data = request.POST.getlist('question') + global editquestionlist + editquestionlist = data + if data == None: + questions = Question.objects.all() + context = {'papers': [], + 'question': None, + 'questions':questions} + return my_render_to_response('exam/showquestions.html', context, + context_instance=RequestContext(request)) + + forms = [] + for j in data: + d = Question.objects.get(id=j) + form = QuestionForm() + form.initial['summary']= d.summary + form.initial['description'] = d.description + form.initial['points']= d.points + form.initial['test'] = d.test + form.initial['options'] = d.options + form.initial['type'] = d.type + form.initial['active'] = d.active + forms.append(form) + + return my_render_to_response('exam/edit_question.html', + {'forms':forms}, + context_instance=RequestContext(request)) else: questions = Question.objects.all() context = {'papers': [], diff --git a/testapp/static/exam/css/base.css b/testapp/static/exam/css/base.css index 6891402..9a37d2f 100644 --- a/testapp/static/exam/css/base.css +++ b/testapp/static/exam/css/base.css @@ -482,7 +482,7 @@ dl dd { hr { margin: 20px 0 19px; border: 0; - border-bottom: 1px solid #eee; + border-bottom: 10px solid; } strong { font-style: inherit; diff --git a/testapp/templates/exam/edit_question.html b/testapp/templates/exam/edit_question.html new file mode 100644 index 0000000..04217ab --- /dev/null +++ b/testapp/templates/exam/edit_question.html @@ -0,0 +1,29 @@ +{% extends "manage.html" %} + +{% block subtitle %} +Edit Question +{% endblock %} + + +{% block manage %} + + + +{% csrf_token %} +{% for form in forms %} + +{{ form.as_table }} +
+
+{% endfor %} + + + +{% endblock %} diff --git a/testapp/templates/exam/showquestions.html b/testapp/templates/exam/showquestions.html index 994ca26..edcba6f 100644 --- a/testapp/templates/exam/showquestions.html +++ b/testapp/templates/exam/showquestions.html @@ -7,7 +7,7 @@ List of Questions {% block script %} {% endblock %} @@ -30,6 +42,8 @@ function my_confirm(frm) {% endfor %}
   - +   + + {% endblock %} diff --git a/testapp/templates/manage.html b/testapp/templates/manage.html index c7c6fa1..10842c3 100644 --- a/testapp/templates/manage.html +++ b/testapp/templates/manage.html @@ -13,7 +13,7 @@

-
+

{% block subtitle %} {% endblock %}

{% block manage %} {% endblock %} @@ -22,6 +22,10 @@ .content .span4 { min-height: 500px; } + .textarea + { + width: 10px; + }
-- cgit From dd3fd7b8c58d836baba24441e7d55c6d51858eab Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Thu, 23 Feb 2012 18:49:36 +0530 Subject: View for Editing Quiz --- testapp/exam/urls.py | 1 + testapp/exam/views.py | 49 ++++++++++++++++++++++++++++++++++- testapp/templates/exam/edit_quiz.html | 31 ++++++++++++++++++++++ testapp/templates/exam/show_quiz.html | 15 ++++++++++- testapp/templates/exam/user_data.html | 28 +++----------------- 5 files changed, 98 insertions(+), 26 deletions(-) create mode 100644 testapp/templates/exam/edit_quiz.html diff --git a/testapp/exam/urls.py b/testapp/exam/urls.py index 67debd2..a8b81f7 100644 --- a/testapp/exam/urls.py +++ b/testapp/exam/urls.py @@ -14,6 +14,7 @@ urlpatterns = patterns('exam.views', url(r'^manage/addquestion/$', 'add_question'), url(r'^manage/addquestion/(?P\d+)/$', 'add_question'), url(r'^manage/addquiz/$', 'add_quiz'), + url(r'^manage/editquiz/$', 'edit_quiz'), url(r'^manage/editquestion/$', 'edit_question'), url(r'^manage/addquiz/(?P\d+)/$', 'add_quiz'), url(r'^manage/gradeuser/$', 'show_all_users'), diff --git a/testapp/exam/views.py b/testapp/exam/views.py index 22151e7..6eea338 100644 --- a/testapp/exam/views.py +++ b/testapp/exam/views.py @@ -92,6 +92,27 @@ def user_register(request): {'form':form}, context_instance=RequestContext(request)) +def edit_quiz(request): + user = request.user + if not user.is_authenticated() or user.groups.filter(name='moderator').count() == 0 : + raise Http404('You are not allowed to view this page!') + + start_date = request.POST.getlist('start_date') + duration = request.POST.getlist('duration') + active = request.POST.getlist('active') + description = request.POST.getlist('description') + + j = 0 + for i in quizlist: + quiz = Quiz.objects.get(id=i) + quiz.start_date = start_date[j] + quiz.duration = duration[j] + quiz.active = active[j] + quiz.description = description[j] + quiz.save() + j += 1 + return my_redirect("/exam/manage/showquiz/") + def edit_question(request): user = request.user if not user.is_authenticated() or user.groups.filter(name='moderator').count() == 0 : @@ -472,7 +493,7 @@ def show_all_quiz(request): if not user.is_authenticated() or user.groups.filter(name='moderator').count() == 0: raise Http404('You are not allowed to view this page !') - if request.method == 'POST': + if request.method == 'POST' and request.POST.get('delete')=='delete': data = request.POST.getlist('quiz') if data == None: quizzes = Quiz.objects.all() @@ -489,6 +510,32 @@ def show_all_quiz(request): 'quizzes':quizzes} return my_render_to_response('exam/show_quiz.html', context, context_instance=RequestContext(request)) + + elif request.method == 'POST' and request.POST.get('edit')=='edit': + data = request.POST.getlist('quiz') + global quizlist + quizlist = data + if data == None: + quiz = Quiz.objects.all() + context = {'papers': [], + 'quiz': None, + 'quizzes':quiz} + return my_render_to_response('exam/showquiz.html', context, + context_instance=RequestContext(request)) + + forms = [] + for j in data: + d = Quiz.objects.get(id=j) + form = QuizForm() + form.initial['start_date']= d.start_date + form.initial['duration'] = d.duration + form.initial['active']= d.active + form.initial['description'] = d.description + forms.append(form) + + return my_render_to_response('exam/edit_quiz.html', + {'forms':forms}, + context_instance=RequestContext(request)) else: quizzes = Quiz.objects.all() diff --git a/testapp/templates/exam/edit_quiz.html b/testapp/templates/exam/edit_quiz.html new file mode 100644 index 0000000..7744623 --- /dev/null +++ b/testapp/templates/exam/edit_quiz.html @@ -0,0 +1,31 @@ +{% extends "manage.html" %} + + +{% block subtitle %} +Edit Quiz(zes) +{% endblock %} + +{% block manage %} + + +
+{% csrf_token %} +{% for form in forms %} + + +{{ form.as_table }} +
+ +
+{% endfor %} + + +
+{% endblock %} diff --git a/testapp/templates/exam/show_quiz.html b/testapp/templates/exam/show_quiz.html index 001b2fe..d546b06 100644 --- a/testapp/templates/exam/show_quiz.html +++ b/testapp/templates/exam/show_quiz.html @@ -17,6 +17,17 @@ function my_confirm(frm) } } +function confirm_edit(frm) +{ + var n = 0; + for (var i =0;i {% endblock %} @@ -39,7 +50,9 @@ function my_confirm(frm)   {{ quiz.description }}
{% endfor %}

-   +   +   + {% endif %} {% endblock %} diff --git a/testapp/templates/exam/user_data.html b/testapp/templates/exam/user_data.html index c835f61..943dfe8 100644 --- a/testapp/templates/exam/user_data.html +++ b/testapp/templates/exam/user_data.html @@ -1,20 +1,11 @@ -{% extends "base.html" %} +{% extends "manage.html" %} {% block title %} Data for user {{ data.user.get_full_name.title }} {% endblock title %} -{% block content %} +{% block manage %} -
-
-
-
Online Test
-
-
-
-
Data for user {{ data.user.get_full_name.title }}

+{% block subtitle %}Data for user {{ data.user.get_full_name.title }}{% endblock %}
- -
Name: {{ data.user.get_full_name.title }}
Username: {{ data.user.username }}
@@ -87,16 +78,5 @@ User IP address: {{ paper.user_ip }} Monitor quiz {% endwith %} {% endif %} -
-Admin - -
-
-
-
-
© FOSSEE group, IIT Bombay
-
- -
-{% endblock content %} +{% endblock %} -- cgit From b1fbf5b02280de5b78b0249e777a179e34b50b98 Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Fri, 24 Feb 2012 16:16:38 +0530 Subject: formating and identation --- testapp/exam/forms.py | 7 ++ testapp/exam/views.py | 16 ++- testapp/templates/base.html | 135 +++++++++++---------- testapp/templates/exam/add_question.html | 32 +++-- testapp/templates/exam/add_quiz.html | 36 +++--- testapp/templates/exam/complete.html | 37 +++--- testapp/templates/exam/edit_question.html | 38 +++--- testapp/templates/exam/edit_quiz.html | 43 ++++--- testapp/templates/exam/grade_user.html | 4 +- testapp/templates/exam/intro.html | 103 ++++++---------- testapp/templates/exam/login.html | 76 ++++++------ testapp/templates/exam/monitor.html | 53 ++++----- testapp/templates/exam/question.html | 190 ++++++++++++++---------------- testapp/templates/exam/quit.html | 39 +++--- testapp/templates/exam/register.html | 46 ++++---- testapp/templates/exam/show_quiz.html | 39 +++--- testapp/templates/exam/showquestions.html | 40 +++---- testapp/templates/exam/user_data.html | 6 +- testapp/templates/manage.html | 61 +++++----- 19 files changed, 467 insertions(+), 534 deletions(-) diff --git a/testapp/exam/forms.py b/testapp/exam/forms.py index 1788a08..e622b88 100644 --- a/testapp/exam/forms.py +++ b/testapp/exam/forms.py @@ -18,6 +18,7 @@ UNAME_CHARS = letters + "._" + digits PWD_CHARS = letters + punctuation + digits class UserRegisterForm(forms.Form): + """A Class to create new form for User's Registration. It has the various fields and functions required to register a new user to the system""" username = forms.CharField(max_length=30, help_text='Letters, digits, period and underscores only.') @@ -88,6 +89,8 @@ class UserRegisterForm(forms.Form): return u_name, pwd class UserLoginForm(forms.Form): + """Creates a form which will allow the user to log into the system.""" + username = forms.CharField(max_length = 30) password = forms.CharField(max_length=30, widget=forms.PasswordInput()) @@ -105,6 +108,8 @@ class UserLoginForm(forms.Form): return user class QuizForm(forms.Form): + """Creates a form to add or edit a Quiz. It has the related fields and functions required.""" + start_date = forms.DateField(initial=datetime.date.today) duration = forms.IntegerField() active = forms.BooleanField(required = False) @@ -124,6 +129,8 @@ class QuizForm(forms.Form): new_quiz.save() class QuestionForm(forms.Form): + """Creates a form to add or edit a Question. It has the related fields and functions required.""" + summary = forms.CharField(max_length = 128) description = forms.CharField(widget = forms.Textarea(attrs={'cols': 20, 'rows': 3})) points = forms.FloatField() diff --git a/testapp/exam/views.py b/testapp/exam/views.py index 6eea338..2803538 100644 --- a/testapp/exam/views.py +++ b/testapp/exam/views.py @@ -93,6 +93,8 @@ def user_register(request): context_instance=RequestContext(request)) def edit_quiz(request): + """Edit the list of quizzes seleted by the user for editing.""" + user = request.user if not user.is_authenticated() or user.groups.filter(name='moderator').count() == 0 : raise Http404('You are not allowed to view this page!') @@ -114,6 +116,7 @@ def edit_quiz(request): return my_redirect("/exam/manage/showquiz/") def edit_question(request): + """Edit the list of quizzes seleted by the user for editing.""" user = request.user if not user.is_authenticated() or user.groups.filter(name='moderator').count() == 0 : raise Http404('You are not allowed to view this page!') @@ -142,6 +145,7 @@ def edit_question(request): def add_question(request,question_id=None): """To add a new question in the database. Create a new question and store it.""" + user = request.user if not user.is_authenticated() or user.groups.filter(name='moderator').count() == 0 : raise Http404('You are not allowed to view this page!') @@ -192,6 +196,8 @@ def add_question(request,question_id=None): def add_quiz(request,quiz_id=None): + """To add a new quiz in the database. Create a new question and store it.""" + user = request.user if not user.is_authenticated() or user.groups.filter(name='moderator').count() == 0 : raise Http404('You are not allowed to view this page!') @@ -237,6 +243,7 @@ def add_quiz(request,quiz_id=None): def prof_manage(request): """Take credentials of the user with professor/moderator rights/permissions and log in.""" + user = request.user if user.is_authenticated() and user.groups.filter(name='moderator').count() > 0: return render_to_response('manage.html',{}) @@ -340,6 +347,7 @@ def question(request, q_id): def show_question(request, q_id): """Show a question if possible.""" + if len(q_id) == 0: msg = 'Congratulations! You have successfully completed the quiz.' return complete(request, msg) @@ -347,7 +355,7 @@ def show_question(request, q_id): return question(request, q_id) def check(request, q_id): - + """Checks the answers of the user for particular question""" user = request.user if not user.is_authenticated(): @@ -432,8 +440,8 @@ def complete(request,reason = None): return my_redirect('/exam/') def monitor(request, quiz_id=None): - """Monitor the progress of the papers taken so far.""" + user = request.user if not user.is_authenticated() or user.groups.filter(name='moderator').count() == 0: raise Http404('You are not allowed to view this page!') @@ -479,6 +487,7 @@ def get_user_data(username): def show_all_users(request): """Shows all the users who have taken various exams/quiz.""" + user = request.user if not user.is_authenticated() or user.groups.filter(name='moderator').count() == 0: raise Http404('You are not allowed to view this page !') @@ -489,6 +498,7 @@ def show_all_users(request): def show_all_quiz(request): """Generates a list of all the quizzes that are currently in the database.""" + user = request.user if not user.is_authenticated() or user.groups.filter(name='moderator').count() == 0: raise Http404('You are not allowed to view this page !') @@ -548,6 +558,7 @@ def show_all_quiz(request): def show_all_questions(request): """Show a list of all the questions currently in the databse.""" + user = request.user if not user.is_authenticated() or user.groups.filter(name='moderator').count() == 0 : raise Http404("You are not allowed to view this page !") @@ -608,6 +619,7 @@ def show_all_questions(request): def user_data(request, username): """Render user data.""" + current_user = request.user if not current_user.is_authenticated() or current_user.groups.filter(name='moderator').count() == 0: raise Http404('You are not allowed to view this page!') diff --git a/testapp/templates/base.html b/testapp/templates/base.html index 54a2035..49fc7ce 100644 --- a/testapp/templates/base.html +++ b/testapp/templates/base.html @@ -2,84 +2,83 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - + + + {% block title %} + {% endblock %} + - -{% block title %} -{% endblock %} - + {% block meta %} + + + + {% endblock %} -{% block meta %} - - - -{% endblock %} - - - -{% block css %} - + {% endblock %} - .content .span10, - .content .span14 { - min-height: 500px; - } - - .content .span4 { - margin-left: 0; - padding-left: 19px; - border-left: 1px solid #eee; - } - - .topbar .btn { - border: 0; - } - - -{% endblock %} - -{% block script %} -{% endblock %} - + {% block script %} + {% endblock %} +
-{% block content %} -{% endblock %} + {% block content %} + {% endblock %}
- diff --git a/testapp/templates/exam/add_question.html b/testapp/templates/exam/add_question.html index 2d42b34..d5503b5 100644 --- a/testapp/templates/exam/add_question.html +++ b/testapp/templates/exam/add_question.html @@ -1,27 +1,25 @@ {% extends "manage.html" %} -{% block subtitle %} -Add Question -{% endblock %} +{% block subtitle %}Add Question{% endblock %} {% block manage %} - + -{% csrf_token %} - -{{ form.as_table }} -
- - + {% csrf_token %} + + {{ form.as_table }} +
+ + {% endblock %} diff --git a/testapp/templates/exam/add_quiz.html b/testapp/templates/exam/add_quiz.html index d51d129..4dae30b 100644 --- a/testapp/templates/exam/add_quiz.html +++ b/testapp/templates/exam/add_quiz.html @@ -1,28 +1,26 @@ {% extends "manage.html" %} -{% block subtitle %} -Add Quiz -{% endblock %} +{% block subtitle %}Add Quiz{% endblock %} {% block manage %} + -
-{% csrf_token %} - - -{{ form.as_table }} -
- - - + {% csrf_token %} + + + {{ form.as_table }} +
+ + +
{% endblock %} diff --git a/testapp/templates/exam/complete.html b/testapp/templates/exam/complete.html index 6a401a4..f5c658f 100644 --- a/testapp/templates/exam/complete.html +++ b/testapp/templates/exam/complete.html @@ -3,26 +3,21 @@ {% block title %}Good bye!{% endblock %} {% block content %} - - -
-
-
-
Online Test
-
-
-
- -
Good bye!
- -
{{message}}
- -
You may now close the browser.
- -
-
-
© FOSSEE group, IIT Bombay
-
+
+
+
+
Online Test
+
+
+
+
Good bye!
+
{{message}}
+
You may now close the browser.
+
+
+
+
+
© FOSSEE group, IIT Bombay
+

- {% endblock content %} diff --git a/testapp/templates/exam/edit_question.html b/testapp/templates/exam/edit_question.html index 04217ab..7613cc6 100644 --- a/testapp/templates/exam/edit_question.html +++ b/testapp/templates/exam/edit_question.html @@ -1,29 +1,27 @@ {% extends "manage.html" %} -{% block subtitle %} -Edit Question -{% endblock %} +{% block subtitle %}Edit Question{% endblock %} {% block manage %} - +
-{% csrf_token %} -{% for form in forms %} - -{{ form.as_table }} -
-
-{% endfor %} - - + {% csrf_token %} + {% for form in forms %} + + {{ form.as_table }} +
+
+ {% endfor %} + +
{% endblock %} diff --git a/testapp/templates/exam/edit_quiz.html b/testapp/templates/exam/edit_quiz.html index 7744623..27b179f 100644 --- a/testapp/templates/exam/edit_quiz.html +++ b/testapp/templates/exam/edit_quiz.html @@ -1,31 +1,28 @@ {% extends "manage.html" %} -{% block subtitle %} -Edit Quiz(zes) -{% endblock %} +{% block subtitle %}Edit Quiz(zes){% endblock %} {% block manage %} - - +
-{% csrf_token %} -{% for form in forms %} - - -{{ form.as_table }} -
- -
-{% endfor %} - - + {% csrf_token %} + {% for form in forms %} + + + {{ form.as_table }} +
+ +
+ {% endfor %} + +
{% endblock %} diff --git a/testapp/templates/exam/grade_user.html b/testapp/templates/exam/grade_user.html index bad1765..5b0e1a7 100644 --- a/testapp/templates/exam/grade_user.html +++ b/testapp/templates/exam/grade_user.html @@ -71,8 +71,7 @@ Marks: 1 %} - - Monitor quiz +Monitor quiz {% else %} {% with data.papers.0 as paper %} @@ -81,5 +80,4 @@ Marks: Admin - {% endblock%} diff --git a/testapp/templates/exam/intro.html b/testapp/templates/exam/intro.html index 35a6923..167a4b2 100644 --- a/testapp/templates/exam/intro.html +++ b/testapp/templates/exam/intro.html @@ -3,68 +3,43 @@ {% block title %}Instructions and Rules {% endblock %} {% block content %} - -
-
-
-
Online Test
-
-
-
-
Important instructions & rules

- -
Welcome {{user.first_name.title}} {{user.last_name.title}}, -to the programming quiz!
- -
-This examination system has been developed with the intention of making you -learn programming and be assessed in an interactive and fun manner. -You will be presented with a series of programming questions and problems that -you will answer online and get immediate feedback for. -
- -
Here are some important instructions and rules that you should understand -carefully. -
- -
- -
For any programming questions, you can submit solutions as many times as - you want without a penalty. You may skip questions and solve them later. -
- -
You may use your computer's Python/IPython shell or - an editor to solve - the problem and cut/paste the solution to the web interface. -
- -
You are not allowed to use any internet - resources, i.e. no google etc.
- -
Do not copy or share the questions or answers with anyone until the - exam is complete for everyone.
- -
All your attempts at the questions are logged. - Do not try to outsmart and break the testing system. If you do, we know - who you are and we will expell you from the course. You have been warned. -
- -
- -
We hope you enjoy taking this exam !!!
- -
-{% csrf_token %} - - -
-
-
-
-
-
© FOSSEE group, IIT Bombay
-
- -
- +
+
+
+
Online Test
+
+
+
+
Important instructions & rules

+
Welcome {{user.first_name.title}} {{user.last_name.title}}, to the programming quiz!
+
+ This examination system has been developed with the intention of making you + learn programming and be assessed in an interactive and fun manner. + You will be presented with a series of programming questions and problems that + you will answer online and get immediate feedback for. +
+
Here are some important instructions and rules that you should understand carefully.
+
+
For any programming questions, you can submit solutions as many times as you want without a penalty. You may skip questions and solve them later. +
+
You may use your computer's Python/IPython shell or an editor to solve the problem and cut/paste the solution to the web interface. +
+
You are not allowed to use any internet resources, i.e. no google etc.
+
Do not copy or share the questions or answers with anyone until the exam is complete for everyone.
+
All your attempts at the questions are logged. Do not try to outsmart and break the testing system. If you do, we know who you are and we will expell you from the course. You have been warned. +
+
+
We hope you enjoy taking this exam !!!
+ +
+ {% csrf_token %} + +
+
+
+
+
+
© FOSSEE group, IIT Bombay
+
+
{% endblock content %} diff --git a/testapp/templates/exam/login.html b/testapp/templates/exam/login.html index 62aedcf..07a91fc 100644 --- a/testapp/templates/exam/login.html +++ b/testapp/templates/exam/login.html @@ -3,46 +3,40 @@ {% block title %}Login{% endblock title %} {% block content %} - -
-
-
-
Online Test
-
-
-
-
Login

-
-{% csrf_token %} - - - -{{ form.as_table }} -
- -     -
Forgot Password?
-New User? Sign-Up -
+
+
+
+
Online Test
+
+
+
+
Login

+
+ {% csrf_token %} + + + {{ form.as_table }} +
+      +
Forgot Password?
+ New User? Sign-Up +
+
+
+
+
+
© FOSSEE group, IIT Bombay
+

-
-
-
-
© FOSSEE group, IIT Bombay
-
- -
- - {% endblock content %} diff --git a/testapp/templates/exam/monitor.html b/testapp/templates/exam/monitor.html index 60814c7..a0287e7 100644 --- a/testapp/templates/exam/monitor.html +++ b/testapp/templates/exam/monitor.html @@ -6,18 +6,15 @@ {% block manage %} -{% if not quizzes and not quiz %} -
Quiz results
- -
No quizzes available.
- -{% endif %} + {% if not quizzes and not quiz %} +
Quiz results
+
No quizzes available.
+ {% endif %} {# ############################################################### #} {# This is rendered when we are just viewing exam/monitor #} {% if quizzes %}
Available quizzes
-
{% for quiz in quizzes %}
{{ quiz.description }}
@@ -33,32 +30,32 @@ {% if papers %} {#
Quiz: {{ quiz_name }}
#}
Number of papers: {{ papers|length }}
- + - - - - - - - + + + + + + + {% for paper in papers %} - - + + diff --git a/testapp/templates/exam/question.html b/testapp/templates/exam/question.html index a02e8c4..113a9ae 100644 --- a/testapp/templates/exam/question.html +++ b/testapp/templates/exam/question.html @@ -1,117 +1,103 @@ {% extends "base.html" %} + - {% block title %} Answer question {% endblock %} +{% block title %} Answer question {% endblock %} {% block script %} - + {% endblock script %} {% block onload %} onload="update_time()" {% endblock onload %} {% block content %} -
-
-
-
Online Test
- - -
- {% csrf_token %} - - -
-
-
+
+
+
Online Test
+
+ {% csrf_token %} + + +
+
+
-
-
-
Test for {{ user.first_name.title }} {{ user.last_name.title }}
-
-
-
- -
{{ question.summary }}
-
{{ question.description|safe }}
-
(Marks : {{ question.points }})
- - -{% if error_message %}
ERROR:
{{ error_message }}
{% endif %} - -
- -
-{% csrf_token %} -{% if question.type == "mcq" %} -{% for option in question.options.strip.splitlines %} -{{option}}
-{% endfor %} -{% else %} -{% if last_attempt %}{{last_attempt.strip}}{% else %}{% if question.type == "bash" %}#!/bin/bash{% else %}# Enter your answer here.{% endif %}{% endif %} -{% endif %} - -{% if question.type == "mcq" %} -
   - -{% else %} -   - -{% endif %} - - - - -
{{ user.first_name.title }} {{ user.last_name.title }}, You have {{ paper.questions_left }} question(s) left in {{ quiz_name }}
- -
Time left:
- -
- -
-
-
© FOSSEE group, IIT Bombay
-
+
+
+
Test for {{ user.first_name.title }} {{ user.last_name.title }}
+
+
+
+
{{ question.summary }}
+
{{ question.description|safe }}
+
(Marks : {{ question.points }})
+ {% if error_message %}
ERROR:
{{ error_message }}
{% endif %} +
+
+ {% csrf_token %} + {% if question.type == "mcq" %} + {% for option in question.options.strip.splitlines %} + {{option}}
+ {% endfor %} + {% else %} + {% if last_attempt %}{{last_attempt.strip}}{% else %}{% if question.type == "bash" %} #!/bin/bash{% else %}# Enter your answer here.{% endif %}{% endif %} + {% endif %} + + {% if question.type == "mcq" %} +
   + {% else %} +    + {% endif %} + + +
{{ user.first_name.title }} {{ user.last_name.title }}, You have {{ paper.questions_left }} question(s) left in {{ quiz_name }}
+
Time left:
+
+
+
+
+
+
© FOSSEE group, IIT Bombay
+

- {% endblock content %} diff --git a/testapp/templates/exam/quit.html b/testapp/templates/exam/quit.html index 3ee85db..118ea07 100644 --- a/testapp/templates/exam/quit.html +++ b/testapp/templates/exam/quit.html @@ -2,28 +2,25 @@ {% block title %}Quit exam {% endblock %} - - {% block content %} -
-
-
-
Online Test
-
-
-
-
Your current answers are saved.
-
Are you sure you wish to quit the exam?
-
- {% csrf_token %} - - -
-
-
-
-
© FOSSEE group, IIT Bombay
-
+
+
+
Online Test
+
+
+
+
Your current answers are saved.
+
Are you sure you wish to quit the exam?
+
+ {% csrf_token %} + + +
+
+
+
+
© FOSSEE group, IIT Bombay
+

{% endblock content %} diff --git a/testapp/templates/exam/register.html b/testapp/templates/exam/register.html index 1555ab3..e416470 100644 --- a/testapp/templates/exam/register.html +++ b/testapp/templates/exam/register.html @@ -3,32 +3,26 @@ {% block title %}Registration form {% endblock %} {% block content %} - -
-
-
-
New User Registration
-
-
-
+
+
+
+
Online Test
+
+
+

Please fill in the following details

- -
-{% csrf_token %} -

Name Username Roll number Institute Questions answered Total marks Attempts Name Username Roll number Institute Questions answered Total marks Attempts
- {{ paper.user.get_full_name.title }} - {{ paper.user.username }} {{ paper.user.get_full_name.title }} {{ paper.user.username }} {{ paper.profile.roll_number }} {{ paper.profile.institute }} {{ paper.get_answered_str }}
-{{ form.as_table }} -
-   - +
+ {% csrf_token %} + + {{ form.as_table }} +
+    +
+
+
+
+
+
© FOSSEE group, IIT Bombay
+

-
-
- -
-
© FOSSEE group, IIT Bombay
-
- -
- - {% endblock content %} diff --git a/testapp/templates/exam/show_quiz.html b/testapp/templates/exam/show_quiz.html index d546b06..e6aecd6 100644 --- a/testapp/templates/exam/show_quiz.html +++ b/testapp/templates/exam/show_quiz.html @@ -3,33 +3,31 @@ {% block title %} Quiz List {% endblock title %} {% block script %} - + } + {% endblock %} {% block manage %} @@ -46,13 +44,14 @@ function confirm_edit(frm) {% csrf_token %} {% for quiz in quizzes %} -   {{ quiz.description }}
{% endfor %} +

      {% endif %} + {% endblock %} diff --git a/testapp/templates/exam/showquestions.html b/testapp/templates/exam/showquestions.html index edcba6f..116e747 100644 --- a/testapp/templates/exam/showquestions.html +++ b/testapp/templates/exam/showquestions.html @@ -1,37 +1,34 @@ {% extends "manage.html" %} -{% block subtitle %} -List of Questions -{% endblock %} +{% block subtitle %}List of Questions {% endblock %} {% block script %} - + } + {% endblock %} {% block manage %} @@ -44,6 +41,5 @@ function confirm_edit(frm)       - {% endblock %} diff --git a/testapp/templates/exam/user_data.html b/testapp/templates/exam/user_data.html index 943dfe8..fad0310 100644 --- a/testapp/templates/exam/user_data.html +++ b/testapp/templates/exam/user_data.html @@ -70,12 +70,10 @@ User IP address: {{ paper.user_ip }} Grade/correct paper
{% if data.papers.count > 1 %} - - Monitor quiz +Monitor quiz {% else %} {% with data.papers.0 as paper %} - - Monitor quiz +Monitor quiz {% endwith %} {% endif %} diff --git a/testapp/templates/manage.html b/testapp/templates/manage.html index 10842c3..a2941b0 100644 --- a/testapp/templates/manage.html +++ b/testapp/templates/manage.html @@ -3,47 +3,42 @@ {% block title %}Manage{% endblock title %} {% block content %} -

Online Test -

-
-
{% block subtitle %} {% endblock %}

- {% block manage %} - {% endblock %} -
- - -
-
Manage
-
-
Questions
-
Quizzes
-
Grade User
-
Monitor
-
-
+ } + +
+
Manage
+
+
Questions
+
Quizzes
+
Grade User
+
Monitor
+
+

-
-
-
© FOSSEE group, IIT Bombay
-
- -
- - +

Name	Username	Roll number	Institute	Questions answered	Total marks	Attempts	Name	Username	Roll number	Institute	Questions answered	Total marks	Attempts
- {{ paper.user.get_full_name.title }}	- {{ paper.user.username }}	{{ paper.user.get_full_name.title }}	{{ paper.user.username }}	{{ paper.profile.roll_number }}	{{ paper.profile.institute }}	{{ paper.get_answered_str }}

+
+
© FOSSEE group, IIT Bombay
+
+

{% endblock content %} -- cgit From b7ad768a6cc4fe5c8a05e20b1968f13a678c22cc Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Tue, 28 Feb 2012 12:09:28 +0530 Subject: changes to remove the inline css from every page --- testapp/static/exam/css/base.css | 42 +++++++++++++-- testapp/static/exam/css/gradeuser.css | 6 +++ testapp/static/exam/css/login.css | 10 ++++ testapp/static/exam/css/monitor.css | 11 ++++ testapp/static/exam/css/question_quiz.css | 9 ++++ testapp/templates/base.html | 78 +++++++--------------------- testapp/templates/exam/add_question.html | 12 ++--- testapp/templates/exam/add_quiz.html | 13 ++--- testapp/templates/exam/complete.html | 16 +----- testapp/templates/exam/edit_question.html | 14 ++--- testapp/templates/exam/edit_quiz.html | 12 ++--- testapp/templates/exam/grade_user.html | 11 ++-- testapp/templates/exam/intro.html | 19 ++----- testapp/templates/exam/login.html | 36 +++---------- testapp/templates/exam/monitor.html | 15 ++---- testapp/templates/exam/question.html | 23 +++------ testapp/templates/exam/quit.html | 17 +----- testapp/templates/exam/register.html | 36 +++++-------- testapp/templates/manage.html | 86 ++++++++++++++++++------------- 19 files changed, 205 insertions(+), 261 deletions(-) create mode 100644 testapp/static/exam/css/gradeuser.css create mode 100644 testapp/static/exam/css/login.css create mode 100644 testapp/static/exam/css/monitor.css create mode 100644 testapp/static/exam/css/question_quiz.css diff --git a/testapp/static/exam/css/base.css b/testapp/static/exam/css/base.css index 9a37d2f..d2b227f 100644 --- a/testapp/static/exam/css/base.css +++ b/testapp/static/exam/css/base.css @@ -1,6 +1,8 @@ html, body { + background-color: #eee; margin: 0; padding: 0; + } h1, h2, @@ -168,20 +170,53 @@ textarea { * Basic and global styles for generating a grid system, structural layout, and page templates * ------------------------------------------------------------------------------------------- */ body { - background-color: #ffffff; + padding-top : 10px; + background-color: #eee; margin: 0; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 13px; font-weight: normal; line-height: 18px; color: #404040; + } .container { - width: 940px; + width: 820px; margin-left: auto; margin-right: auto; zoom: 1; } +.container > footer p { + text-align: center; +} +.container > .content { + background-color: #fff; + padding: 20px; + margin: 0 -20px; + -webkit-border-radius: 0 0 6px 6px; + -moz-border-radius: 0 0 6px 6px; + border-radius: 0 0 6px 6px; + -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.15); + -moz-box-shadow: 0 1px 2px rgba(0,0,0,.15); + box-shadow: 0 1px 2px rgba(0,0,0,.15); +} +.content .span10, +.content .span14 { + min-height: 500px; +} +.content .span4 { + margin-left: 0; + padding-left: 19px; + border-left: 1px solid #eee; +} +.topbar .btn { + border: 0; +} +.page-header { + background-color: #f5f5f5; + padding: 20px 20px 10px; + margin: -20px -20px 20px; +} .container:before, .container:after { display: table; content: ""; @@ -263,6 +298,7 @@ a:hover { width: 160px; } .span4 { + min-height : 500px; width: 220px; } .span5 { @@ -281,7 +317,7 @@ a:hover { width: 520px; } .span10 { - width: 580px; + width: 560px; } .span11 { width: 640px; diff --git a/testapp/static/exam/css/gradeuser.css b/testapp/static/exam/css/gradeuser.css new file mode 100644 index 0000000..e50ab4e --- /dev/null +++ b/testapp/static/exam/css/gradeuser.css @@ -0,0 +1,6 @@ +textarea +{ +width : 550px; +height : 200px; + +} diff --git a/testapp/static/exam/css/login.css b/testapp/static/exam/css/login.css new file mode 100644 index 0000000..a10cbaa --- /dev/null +++ b/testapp/static/exam/css/login.css @@ -0,0 +1,10 @@ +label +{ + padding-top: 6px; + font-size: 15px; + line-height: 18px; + float: left; + width: 80px; + text-align: center; + color: #404040; + } diff --git a/testapp/static/exam/css/monitor.css b/testapp/static/exam/css/monitor.css new file mode 100644 index 0000000..b16c8b3 --- /dev/null +++ b/testapp/static/exam/css/monitor.css @@ -0,0 +1,11 @@ + table td + { + vertical-align: top; + border-top: 1px solid #ddd; + } + table tbody th + { + border-top: 1px solid #ddd; + vertical-align: top; + } + diff --git a/testapp/static/exam/css/question_quiz.css b/testapp/static/exam/css/question_quiz.css new file mode 100644 index 0000000..2e13364 --- /dev/null +++ b/testapp/static/exam/css/question_quiz.css @@ -0,0 +1,9 @@ +table th, table td + { + text-align: left; + } +textarea +{ +width : 300px; +height : 150px; +} diff --git a/testapp/templates/base.html b/testapp/templates/base.html index 49fc7ce..fed3939 100644 --- a/testapp/templates/base.html +++ b/testapp/templates/base.html @@ -13,62 +13,9 @@ {% endblock %} - - - + + {% block css %} - {% endblock %} {% block script %} @@ -76,9 +23,22 @@ -
- {% block content %} - {% endblock %} -
+
+
+
+
{% block pagetitle %} {% endblock pagetitle %}
+
+
+
+
{% block formtitle %} {% endblock formtitle %}

+ {% block content %} + {% endblock %} +
+
+
+
+
© FOSSEE group, IIT Bombay
+
+
diff --git a/testapp/templates/exam/add_question.html b/testapp/templates/exam/add_question.html index d5503b5..59a1d64 100644 --- a/testapp/templates/exam/add_question.html +++ b/testapp/templates/exam/add_question.html @@ -2,17 +2,11 @@ {% block subtitle %}Add Question{% endblock %} +{% block css %} + +{% endblock %} {% block manage %} - -
{% csrf_token %} diff --git a/testapp/templates/exam/add_quiz.html b/testapp/templates/exam/add_quiz.html index 4dae30b..dedc627 100644 --- a/testapp/templates/exam/add_quiz.html +++ b/testapp/templates/exam/add_quiz.html @@ -3,16 +3,11 @@ {% block subtitle %}Add Quiz{% endblock %} -{% block manage %} - +{% block css %} + +{% endblock %} +{% block manage %} {% csrf_token %} diff --git a/testapp/templates/exam/complete.html b/testapp/templates/exam/complete.html index f5c658f..dfeee6c 100644 --- a/testapp/templates/exam/complete.html +++ b/testapp/templates/exam/complete.html @@ -2,22 +2,10 @@ {% block title %}Good bye!{% endblock %} +{% block pagetitle %}Online Test{% endblock %} {% block content %} -
-
-
-
Online Test
-
-
-
+
Good bye!

{{message}}

You may now close the browser.
-
-
-
-
-
© FOSSEE group, IIT Bombay
-
-
{% endblock content %} diff --git a/testapp/templates/exam/edit_question.html b/testapp/templates/exam/edit_question.html index 7613cc6..6a4f1ec 100644 --- a/testapp/templates/exam/edit_question.html +++ b/testapp/templates/exam/edit_question.html @@ -2,21 +2,15 @@ {% block subtitle %}Edit Question{% endblock %} +{% block css %} + +{% endblock %} {% block manage %} - - {% csrf_token %} {% for form in forms %} -
+
{{ form.as_table }}

diff --git a/testapp/templates/exam/edit_quiz.html b/testapp/templates/exam/edit_quiz.html index 27b179f..56eb0c0 100644 --- a/testapp/templates/exam/edit_quiz.html +++ b/testapp/templates/exam/edit_quiz.html @@ -3,15 +3,11 @@ {% block subtitle %}Edit Quiz(zes){% endblock %} +{% block css %} + +{% endblock %} + {% block manage %} - {% csrf_token %} {% for form in forms %} diff --git a/testapp/templates/exam/grade_user.html b/testapp/templates/exam/grade_user.html index 5b0e1a7..fccdaaa 100644 --- a/testapp/templates/exam/grade_user.html +++ b/testapp/templates/exam/grade_user.html @@ -3,6 +3,10 @@ {% block title %} Grading papers for {{ data.user.get_full_name.title }} {% endblock title %} {% block subtitle %}Grading papers for {{ data.user.get_full_name.title }}{% endblock %} + +{% block css %} + +{% endblock %} {% block manage %} @@ -32,12 +36,13 @@ Start time: {{ paper.start_time }}
{% if paper.answers.count %}
Answers

+ action="{{URL_ROOT}}/exam/manage/gradeuser/{{data.user.username}}/" method="post"> {% csrf_token %} {% for question, answers in paper.get_question_answers.items %}
- - Question: {{ question.id }}. {{ question.summary }} + + Question: {{ question.id }}. {{ question.summary }} (Points: {{ question.points }})
{% if question.type == "mcq" %}
Choices: diff --git a/testapp/templates/exam/intro.html b/testapp/templates/exam/intro.html index 167a4b2..ef218a2 100644 --- a/testapp/templates/exam/intro.html +++ b/testapp/templates/exam/intro.html @@ -3,14 +3,10 @@ {% block title %}Instructions and Rules {% endblock %} {% block content %} -
-
-
-
Online Test
-
-
-
-
Important instructions & rules

+ +{% block pagetitle %}Online Test {% endblock %} +{% block formtitle %}Important instructions & rules {% endblock %} +
Welcome {{user.first_name.title}} {{user.last_name.title}}, to the programming quiz!

This examination system has been developed with the intention of making you @@ -35,11 +31,4 @@ {% csrf_token %}
-
-
-
-
-
© FOSSEE group, IIT Bombay
-
-
{% endblock content %} diff --git a/testapp/templates/exam/login.html b/testapp/templates/exam/login.html index 07a91fc..078e7a7 100644 --- a/testapp/templates/exam/login.html +++ b/testapp/templates/exam/login.html @@ -1,30 +1,16 @@ {% extends "base.html" %} {% block title %}Login{% endblock title %} - +{% block pagetitle %} Online Test {% endblock %} +{% block formtitle %}Login{% endblock %} +{% block css %} + +{% endblock %} {% block content %} -
-
-
-
Online Test
-
-
-
-
Login

+
{% csrf_token %} - + {{ form.as_table }}
@@ -32,11 +18,5 @@
Forgot Password?
New User? Sign-Up
-
-
-
-
-
© FOSSEE group, IIT Bombay
-
-
+ {% endblock content %} diff --git a/testapp/templates/exam/monitor.html b/testapp/templates/exam/monitor.html index a0287e7..9385e73 100644 --- a/testapp/templates/exam/monitor.html +++ b/testapp/templates/exam/monitor.html @@ -4,6 +4,9 @@ {% block meta %} {% endblock meta %} +{% block css %} + +{% endblock %} {% block manage %} {% if not quizzes and not quiz %} @@ -30,18 +33,6 @@ {% if papers %} {#
Quiz: {{ quiz_name }}
#}
Number of papers: {{ papers|length }}
- diff --git a/testapp/templates/exam/question.html b/testapp/templates/exam/question.html index 113a9ae..f5dcdf4 100644 --- a/testapp/templates/exam/question.html +++ b/testapp/templates/exam/question.html @@ -48,6 +48,7 @@ {% block onload %} onload="update_time()" {% endblock onload %} +{% block pagetitle %}
Test for {{ user.first_name.title }} {{ user.last_name.title }}
{% endblock %} {% block content %}

@@ -61,16 +62,10 @@

-
-
-
-
Test for {{ user.first_name.title }} {{ user.last_name.title }}
-
-
-
-
{{ question.summary }}
-
{{ question.description|safe }}
-
(Marks : {{ question.points }})
+ +
{{ question.summary }} (Marks : {{ question.points }})

+ {{ question.description|safe }} + {% if error_message %}
ERROR:
{{ error_message }}
{% endif %}

@@ -93,11 +88,5 @@
{{ user.first_name.title }} {{ user.last_name.title }}, You have {{ paper.questions_left }} question(s) left in {{ quiz_name }}

Time left:

-
-
-
-
-
© FOSSEE group, IIT Bombay
-
-
+ {% endblock content %} diff --git a/testapp/templates/exam/quit.html b/testapp/templates/exam/quit.html index 118ea07..40a0a92 100644 --- a/testapp/templates/exam/quit.html +++ b/testapp/templates/exam/quit.html @@ -1,26 +1,13 @@ {% extends "base.html" %} {% block title %}Quit exam {% endblock %} - +{% block pagetitle %}Online Test {% endblock %} {% block content %} -
-
-
-
Online Test
-
-
-
+
Your current answers are saved.

Are you sure you wish to quit the exam?
{% csrf_token %} -
-
-
-
-
© FOSSEE group, IIT Bombay
-
-
{% endblock content %} diff --git a/testapp/templates/exam/register.html b/testapp/templates/exam/register.html index e416470..5ff79cc 100644 --- a/testapp/templates/exam/register.html +++ b/testapp/templates/exam/register.html @@ -2,27 +2,19 @@ {% block title %}Registration form {% endblock %} +{% block pagetitle %}Online Test {% endblock %} +{% block formtitle %}Please fill in the following details {% endblock %} + {% block content %} -
-
-
-
Online Test
-
-
-
-
Please fill in the following details

-
- {% csrf_token %} -

Name
- {{ form.as_table }} -
- - -

-
-
© FOSSEE group, IIT Bombay
-
-

+ + + +
+ {% csrf_token %} + + {{ form.as_table }} +
+ +
+ {% endblock content %} diff --git a/testapp/templates/manage.html b/testapp/templates/manage.html index a2941b0..9995450 100644 --- a/testapp/templates/manage.html +++ b/testapp/templates/manage.html @@ -1,44 +1,56 @@ -{% extends "base.html" %} + -{% block title %}Manage{% endblock title %} + + + + {% block title %} + {% endblock %} + -{% block content %} -
-
-
- Online Test - -
+ {% block meta %} + + + + {% endblock %} + + + {% block css %} + {% endblock %} -
-
-
{% block subtitle %} {% endblock %}

- {% block manage %} - {% endblock %} -
- -
+ {% block script %} + {% endblock %} + + + + +
+
+
+ Online Test + +
+
+
+
{% block subtitle %} {% endblock %}

+ {% block manage %} + {% endblock %} +
+

Manage

-
Questions
+
Questions

Quizzes
-
Grade User
-
Monitor
+
Grade User
+
Monitor

-
-
-
-
-
© FOSSEE group, IIT Bombay
-
-
-{% endblock content %} +
+
+
+
+
© FOSSEE group, IIT Bombay
+
+
+ + + -- cgit From 7660073c5c83534a869f685b27c0fe0152b9983c Mon Sep 17 00:00:00 2001 From: jayparikh111 Date: Tue, 28 Feb 2012 18:14:17 +0530 Subject: Minor changes for displaying question details in grade_user and licensing in css --- testapp/static/exam/css/base.css | 20 ++++++++++++++++++ testapp/static/exam/css/gradeuser.css | 32 +++++++++++++++++++++++++++++ testapp/templates/exam/grade_user.html | 37 ++++++++++++++++++++++++++++++---- 3 files changed, 85 insertions(+), 4 deletions(-) diff --git a/testapp/static/exam/css/base.css b/testapp/static/exam/css/base.css index d2b227f..b7a9fbb 100644 --- a/testapp/static/exam/css/base.css +++ b/testapp/static/exam/css/base.css @@ -1,3 +1,23 @@ +/*! +Copyright 2012 Twitter, Inc. + +Licensed under the Apache License, Version 2.0 (the "License"); you may not use this work except in compliance with the License. You may obtain a copy of the License in the LICENSE file, or at: + +Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + * Bootstrap v1.4.0 + * + * Copyright 2011 Twitter, Inc + * Licensed under the Apache License v2.0 + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Designed and built with all the love in the world @twitter by @mdo and @fat. + * Date: Sun Dec 25 20:18:31 PST 2011 + */ +/* Reset.less + * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). + * For Online Test Application, this CSS was changed as per the requirements wherever required. ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- */ + html, body { background-color: #eee; margin: 0; diff --git a/testapp/static/exam/css/gradeuser.css b/testapp/static/exam/css/gradeuser.css index e50ab4e..3f7baf9 100644 --- a/testapp/static/exam/css/gradeuser.css +++ b/testapp/static/exam/css/gradeuser.css @@ -4,3 +4,35 @@ width : 550px; height : 200px; } + +#headerDiv, #contentDiv { +float: left; +width: 510px; +} +#titleText { +float: left; +font-size: 1.1em; +font-weight: bold; +margin: 5px; +} +#myHeader { +font-size: 1.1em; +font-weight: bold; +margin: 5px; +} +#headerDiv { +background-color: #0037DB; +color: #9EB6FF; +} +#contentDiv { +background-color:#F0F8FF; +} +#myContent { +margin: 5px 10px; +} +#headerDiv a { +float: right; +margin: 10px 10px 5px 5px; +} +#headerDiv a:hover { +color: #FFFFFF; diff --git a/testapp/templates/exam/grade_user.html b/testapp/templates/exam/grade_user.html index fccdaaa..5d3aa58 100644 --- a/testapp/templates/exam/grade_user.html +++ b/testapp/templates/exam/grade_user.html @@ -8,6 +8,22 @@ {% endblock %} +{% block script %} + +{% endblock %} {% block manage %}
@@ -35,14 +51,25 @@ Start time: {{ paper.start_time }}
{% if paper.answers.count %}
Answers

-
{% csrf_token %} {% for question, answers in paper.get_question_answers.items %}
- - Question: {{ question.id }}. {{ question.summary }} + Question: {{ question.id }}. {{ question.summary }} +
+
+
+
Description : {{ question.description }}
+
Points : {{ question.points }}
+
Test : {{ question.test }}
+
Options : {{ question.options }}
+
Type : {{ question.type }}
+ +
+
+ + (Points: {{ question.points }})
{% if question.type == "mcq" %}
Choices: @@ -62,6 +89,8 @@ Marks:

{% endwith %} {% endfor %} {# for question, answers ... #} + +
Teacher comments:
{{ paper.comments }} -- cgit From 87862b8c8d7822a4578b5cb5f413bedb37454bd2 Mon Sep 17 00:00:00 2001 From: jayparikh111 Date: Wed, 29 Feb 2012 13:14:00 +0530 Subject: minor changes for rendering question(s) --- testapp/templates/exam/add_question.html | 17 +++++++++++++++-- testapp/templates/exam/edit_question.html | 19 +++++++++++++++++-- testapp/templates/exam/grade_user.html | 4 ++-- 3 files changed, 34 insertions(+), 6 deletions(-) diff --git a/testapp/templates/exam/add_question.html b/testapp/templates/exam/add_question.html index 59a1d64..8bccb66 100644 --- a/testapp/templates/exam/add_question.html +++ b/testapp/templates/exam/add_question.html @@ -2,18 +2,31 @@ {% block subtitle %}Add Question{% endblock %} +{% block script %} + +{% endblock %} {% block css %} {% endblock %} {% block manage %} - + {% csrf_token %} +Look of Question in HTML Format : +
+ {{ form.as_table }}
+ -{% endblock %} +{% endblock %} diff --git a/testapp/templates/exam/edit_question.html b/testapp/templates/exam/edit_question.html index 6a4f1ec..a189ac5 100644 --- a/testapp/templates/exam/edit_question.html +++ b/testapp/templates/exam/edit_question.html @@ -5,11 +5,25 @@ {% block css %} {% endblock %} - +{% block script %} + +{% endblock %} {% block manage %} -
+ {% csrf_token %} + {% for form in forms %} +Look of Question in HTML Format : +
{{ form.as_table }}
@@ -19,3 +33,4 @@
{% endblock %} + diff --git a/testapp/templates/exam/grade_user.html b/testapp/templates/exam/grade_user.html index 5d3aa58..b7970e8 100644 --- a/testapp/templates/exam/grade_user.html +++ b/testapp/templates/exam/grade_user.html @@ -56,7 +56,7 @@ Start time: {{ paper.start_time }}
{% csrf_token %} {% for question, answers in paper.get_question_answers.items %}
- Question: {{ question.id }}. {{ question.summary }} + Question: {{ question.id }}. {{ question.summary }} (Points: {{ question.points }})

@@ -70,7 +70,7 @@ Start time: {{ paper.start_time }}

- (Points: {{ question.points }})

+ {% if question.type == "mcq" %}

Choices: {% for option in question.options.strip.splitlines %} {{option}}, {% endfor %} -- cgit From a7c84a478789e9e835dcbb3ea41b1d519ba69b4d Mon Sep 17 00:00:00 2001 From: jayparikh111 Date: Tue, 13 Mar 2012 18:44:01 +0530 Subject: minor changes for UI --- testapp/exam/forms.py | 2 +- testapp/exam/views.py | 3 ++- testapp/static/exam/css/base.css | 5 ++-- testapp/static/exam/css/question_quiz.css | 6 +---- testapp/templates/exam/add_quiz.html | 14 +++++++++-- testapp/templates/exam/edit_question.html | 40 +++++++++++++++++++++++++++++-- testapp/templates/exam/edit_quiz.html | 21 ++++++++++++---- testapp/templates/exam/grade_user.html | 29 ++++++++++++---------- testapp/templates/exam/monitor.html | 18 +++++++++----- testapp/templates/exam/show_quiz.html | 5 ++-- testapp/templates/exam/user_data.html | 4 ++-- testapp/templates/manage.html | 31 +++++++++++++----------- 12 files changed, 122 insertions(+), 56 deletions(-) diff --git a/testapp/exam/forms.py b/testapp/exam/forms.py index e622b88..272a3d4 100644 --- a/testapp/exam/forms.py +++ b/testapp/exam/forms.py @@ -113,7 +113,7 @@ class QuizForm(forms.Form): start_date = forms.DateField(initial=datetime.date.today) duration = forms.IntegerField() active = forms.BooleanField(required = False) - description = forms.CharField(max_length=256, widget=forms.Textarea(attrs={'cols':20,'rows':2})) + description = forms.CharField(max_length=256, widget=forms.Textarea(attrs={'cols':20,'rows':1})) def save(self): start_date = self.cleaned_data["start_date"] diff --git a/testapp/exam/views.py b/testapp/exam/views.py index 2803538..ffb1b1e 100644 --- a/testapp/exam/views.py +++ b/testapp/exam/views.py @@ -246,7 +246,8 @@ def prof_manage(request): user = request.user if user.is_authenticated() and user.groups.filter(name='moderator').count() > 0: - return render_to_response('manage.html',{}) + context = {'user':user} + return render_to_response('manage.html',context) return my_redirect('/exam/login/') def user_login(request): diff --git a/testapp/static/exam/css/base.css b/testapp/static/exam/css/base.css index b7a9fbb..7099aab 100644 --- a/testapp/static/exam/css/base.css +++ b/testapp/static/exam/css/base.css @@ -1845,8 +1845,9 @@ footer { -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); box-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); } -.page-header h1 { - margin-bottom: 8px; +.page-header h3 { + margin-top: 20px; + margin-bottom : -17px; } .btn.danger, .alert-message.danger, diff --git a/testapp/static/exam/css/question_quiz.css b/testapp/static/exam/css/question_quiz.css index 2e13364..643e5c6 100644 --- a/testapp/static/exam/css/question_quiz.css +++ b/testapp/static/exam/css/question_quiz.css @@ -2,8 +2,4 @@ table th, table td { text-align: left; } -textarea -{ -width : 300px; -height : 150px; -} + diff --git a/testapp/templates/exam/add_quiz.html b/testapp/templates/exam/add_quiz.html index dedc627..fe99ce6 100644 --- a/testapp/templates/exam/add_quiz.html +++ b/testapp/templates/exam/add_quiz.html @@ -6,9 +6,18 @@ {% block css %} {% endblock %} +{% block script %} + +{% endblock %} +{% block onload %} onload="javascript:test();" {% endblock %} {% block manage %} -

{% endblock %} diff --git a/testapp/templates/exam/edit_question.html b/testapp/templates/exam/edit_question.html index a189ac5..b1395e9 100644 --- a/testapp/templates/exam/edit_question.html +++ b/testapp/templates/exam/edit_question.html @@ -15,15 +15,49 @@ function my_render(frm) } } +function load_form() +{ + +} + +function data(showContent,showHideDiv) +{ + var con = document.getElementById(showContent); + var ele=document.getElementById(showHideDiv); + if (ele.style.display=="block") + { + con.style.display = "none" + ele.style.display = "none"; + } + else + { + con.style.display = "block"; + ele.style.display = "block"; + } +} {% endblock %} +{% block onload %} onload='javascript:load_form();' {% endblock %} {% block manage %} + + {% endblock %} diff --git a/testapp/templates/exam/edit_quiz.html b/testapp/templates/exam/edit_quiz.html index 56eb0c0..d513e7a 100644 --- a/testapp/templates/exam/edit_quiz.html +++ b/testapp/templates/exam/edit_quiz.html @@ -5,19 +5,30 @@ {% block css %} + {% endblock %} {% block manage %} diff --git a/testapp/templates/exam/grade_user.html b/testapp/templates/exam/grade_user.html index b7970e8..c6f6343 100644 --- a/testapp/templates/exam/grade_user.html +++ b/testapp/templates/exam/grade_user.html @@ -10,17 +10,20 @@ {% block script %} {% endblock %} @@ -56,9 +59,9 @@ Start time: {{ paper.start_time }}
{% csrf_token %} {% for question, answers in paper.get_question_answers.items %}

- Question: {{ question.id }}. {{ question.summary }} (Points: {{ question.points }})

+ Question: {{ question.id }}. {{ question.summary }}

+ (Points: {{ question.points }})

Description : {{ question.description }}

Points : {{ question.points }}

diff --git a/testapp/templates/exam/monitor.html b/testapp/templates/exam/monitor.html index 9385e73..29cb6e9 100644 --- a/testapp/templates/exam/monitor.html +++ b/testapp/templates/exam/monitor.html @@ -7,17 +7,25 @@ {% block css %} {% endblock %} - +{% block subtitle %} + {% if not quizzes and not quiz %} + Quiz Results + {% endif %} + {% if quizzes %} + Available Quizzes + {% endif %} + {% if quiz %} + {{ quiz.description }} Results + {% endif %} +{% endblock %} {% block manage %} {% if not quizzes and not quiz %} -

Quiz results

No quizzes available.

{% endif %} {# ############################################################### #} {# This is rendered when we are just viewing exam/monitor #} {% if quizzes %} -

Available quizzes

{{ quiz.description }}

{{ quiz.description }} results

Quiz: {{ quiz_name }}

No answer papers so far.

Admin

Available Quiz

No quizzes available.

Quiz List

{% csrf_token %} diff --git a/testapp/templates/exam/user_data.html b/testapp/templates/exam/user_data.html index fad0310..61a3a97 100644 --- a/testapp/templates/exam/user_data.html +++ b/testapp/templates/exam/user_data.html @@ -21,7 +21,7 @@ Last login: {{ data.user.last_login }}

{% if data.papers %} -

Grade/correct paper

@@ -66,7 +66,7 @@ User IP address: {{ paper.user_ip }} {% endif %} {# if data.papers #}

- + Grade/correct paper
{% if data.papers.count > 1 %} diff --git a/testapp/templates/manage.html b/testapp/templates/manage.html index 9995450..77e0b7a 100644 --- a/testapp/templates/manage.html +++ b/testapp/templates/manage.html @@ -23,28 +23,31 @@ - +

{% block subtitle %} {% endblock %}

{% block manage %} {% endblock %}

Manage

-- cgit From 480fc524eaffa99bbcec65b0829f6116ccace673 Mon Sep 17 00:00:00 2001 From: jayparikh111 Date: Thu, 15 Mar 2012 18:12:49 +0530 Subject: minor UI changes --- testapp/exam/forms.py | 12 +- testapp/exam/views.py | 4 +- testapp/static/exam/css/base.css | 16 ++- testapp/static/exam/css/gradeuser.css | 15 ++- testapp/static/exam/css/min.js | 19 +++ testapp/static/exam/css/question.css | 11 ++ testapp/static/exam/css/question_quiz.css | 9 ++ testapp/templates/exam/add_question.html | 138 +++++++++++++++++-- testapp/templates/exam/complete.html | 3 +- testapp/templates/exam/edit_question.html | 217 ++++++++++++++++++++++++------ testapp/templates/exam/grade_user.html | 53 +++----- testapp/templates/exam/intro.html | 6 +- testapp/templates/exam/question.html | 23 +++- testapp/templates/manage.html | 7 +- 14 files changed, 421 insertions(+), 112 deletions(-) create mode 100644 testapp/static/exam/css/min.js create mode 100644 testapp/static/exam/css/question.css diff --git a/testapp/exam/forms.py b/testapp/exam/forms.py index 272a3d4..2a1ae6d 100644 --- a/testapp/exam/forms.py +++ b/testapp/exam/forms.py @@ -11,7 +11,7 @@ import datetime QUESTION_TYPE_CHOICES = ( ("python", "Python"), ("bash", "Bash"), - ("mcq", "MultipleChoice"), + ("mcq", "MCQ"), ) UNAME_CHARS = letters + "._" + digits @@ -131,12 +131,12 @@ class QuizForm(forms.Form): class QuestionForm(forms.Form): """Creates a form to add or edit a Question. It has the related fields and functions required.""" - summary = forms.CharField(max_length = 128) - description = forms.CharField(widget = forms.Textarea(attrs={'cols': 20, 'rows': 3})) + summary = forms.CharField(widget = forms.Textarea(attrs={'cols': 40, 'rows': 1})) + description = forms.CharField(widget = forms.Textarea(attrs={'cols': 40, 'rows': 1})) points = forms.FloatField() - test = forms.CharField(widget = forms.Textarea(attrs={'cols': 20, 'rows': 3})) - options = forms.CharField(widget = forms.Textarea(attrs={'cols': 20, 'rows': 3})) - type = forms.CharField(max_length=24, widget=forms.Select(choices=QUESTION_TYPE_CHOICES)) + test = forms.CharField(widget = forms.Textarea(attrs={'cols': 40, 'rows': 1})) + options = forms.CharField(widget = forms.Textarea(attrs={'cols': 40, 'rows': 1}),required=False) + type = forms.CharField(max_length=8, widget=forms.Select(choices=QUESTION_TYPE_CHOICES)) active = forms.BooleanField(required=False) def save(self): diff --git a/testapp/exam/views.py b/testapp/exam/views.py index ffb1b1e..d0e3ddc 100644 --- a/testapp/exam/views.py +++ b/testapp/exam/views.py @@ -129,8 +129,8 @@ def edit_question(request): type = request.POST.getlist('type') active = request.POST.getlist('active') j = 0 - for i in editquestionlist: - question = Question.objects.get(id=i) + for id_list in editquestionlist: + question = Question.objects.get(id=id_list) question.summary = summary[j] question.description = description[j] question.points = points[j] diff --git a/testapp/static/exam/css/base.css b/testapp/static/exam/css/base.css index 7099aab..069729d 100644 --- a/testapp/static/exam/css/base.css +++ b/testapp/static/exam/css/base.css @@ -538,7 +538,7 @@ dl dd { hr { margin: 20px 0 19px; border: 0; - border-bottom: 10px solid; + border-bottom: 3px solid; } strong { font-style: inherit; @@ -651,6 +651,10 @@ textarea { font-weight: normal; line-height: normal; } +select +{ + width : 80px; +} label { padding-top: 6px; font-size: 13px; @@ -816,6 +820,10 @@ form .clearfix.success .input-prepend .add-on, form .clearfix.success .input-app background-color: #bcddbc; border-color: #468847; } +textarea +{ + width : 290px; +} .input-mini, input.mini, textarea.mini, @@ -1836,7 +1844,6 @@ a.menu:after, .dropdown-toggle:after { footer { margin-top: 17px; padding-top: 17px; - border-top: 1px solid #eee; } .page-header { margin-bottom: 17px; @@ -1871,6 +1878,11 @@ footer { font-family: Arial, sans-serif; line-height: 18px; } +.btn-mini { + padding: 2px 6px; + font-size: 15px; + line-height: 16px; +} .btn.danger, .alert-message.danger, .btn.error, diff --git a/testapp/static/exam/css/gradeuser.css b/testapp/static/exam/css/gradeuser.css index 3f7baf9..2042f85 100644 --- a/testapp/static/exam/css/gradeuser.css +++ b/testapp/static/exam/css/gradeuser.css @@ -5,9 +5,15 @@ height : 200px; } +.for-question{ + background: none repeat scroll 0 0 #F1F1F1; + border-radius: 6px 6px 6px 6px; + margin-bottom: 10px; + padding: 5px; +} + #headerDiv, #contentDiv { float: left; -width: 510px; } #titleText { float: left; @@ -24,9 +30,14 @@ margin: 5px; background-color: #0037DB; color: #9EB6FF; } + #contentDiv { -background-color:#F0F8FF; + background-color:#F0F8FF; + border: 1px solid #C9C9C9; + border-radius: 5px 5px 5px 5px; + margin-bottom: 10px; } + #myContent { margin: 5px 10px; } diff --git a/testapp/static/exam/css/min.js b/testapp/static/exam/css/min.js new file mode 100644 index 0000000..b1ae21d --- /dev/null +++ b/testapp/static/exam/css/min.js @@ -0,0 +1,19 @@ +/* + * jQuery JavaScript Library v1.3.2 + * http://jquery.com/ + * + * Copyright (c) 2009 John Resig + * Dual licensed under the MIT and GPL licenses. + * http://docs.jquery.com/License + * + * Date: 2009-02-19 17:34:21 -0500 (Thu, 19 Feb 2009) + * Revision: 6246 + */ +(function(){var l=this,g,y=l.jQuery,p=l.$,o=l.jQuery=l.$=function(E,F){return new o.fn.init(E,F)},D=/^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/,f=/^.[^:#\[\.,]*$/;o.fn=o.prototype={init:function(E,H){E=E||document;if(E.nodeType){this[0]=E;this.length=1;this.context=E;return this}if(typeof E==="string"){var G=D.exec(E);if(G&&(G[1]||!H)){if(G[1]){E=o.clean([G[1]],H)}else{var I=document.getElementById(G[3]);if(I&&I.id!=G[3]){return o().find(E)}var F=o(I||[]);F.context=document;F.selector=E;return F}}else{return o(H).find(E)}}else{if(o.isFunction(E)){return o(document).ready(E)}}if(E.selector&&E.context){this.selector=E.selector;this.context=E.context}return this.setArray(o.isArray(E)?E:o.makeArray(E))},selector:"",jquery:"1.3.2",size:function(){return this.length},get:function(E){return E===g?Array.prototype.slice.call(this):this[E]},pushStack:function(F,H,E){var G=o(F);G.prevObject=this;G.context=this.context;if(H==="find"){G.selector=this.selector+(this.selector?" ":"")+E}else{if(H){G.selector=this.selector+"."+H+"("+E+")"}}return G},setArray:function(E){this.length=0;Array.prototype.push.apply(this,E);return this},each:function(F,E){return o.each(this,F,E)},index:function(E){return o.inArray(E&&E.jquery?E[0]:E,this)},attr:function(F,H,G){var E=F;if(typeof F==="string"){if(H===g){return this[0]&&o[G||"attr"](this[0],F)}else{E={};E[F]=H}}return this.each(function(I){for(F in E){o.attr(G?this.style:this,F,o.prop(this,E[F],G,I,F))}})},css:function(E,F){if((E=="width"||E=="height")&&parseFloat(F)<0){F=g}return this.attr(E,F,"curCSS")},text:function(F){if(typeof F!=="object"&&F!=null){return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(F))}var E="";o.each(F||this,function(){o.each(this.childNodes,function(){if(this.nodeType!=8){E+=this.nodeType!=1?this.nodeValue:o.fn.text([this])}})});return E},wrapAll:function(E){if(this[0]){var F=o(E,this[0].ownerDocument).clone();if(this[0].parentNode){F.insertBefore(this[0])}F.map(function(){var G=this;while(G.firstChild){G=G.firstChild}return G}).append(this)}return this},wrapInner:function(E){return this.each(function(){o(this).contents().wrapAll(E)})},wrap:function(E){return this.each(function(){o(this).wrapAll(E)})},append:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.appendChild(E)}})},prepend:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.insertBefore(E,this.firstChild)}})},before:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this)})},after:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this.nextSibling)})},end:function(){return this.prevObject||o([])},push:[].push,sort:[].sort,splice:[].splice,find:function(E){if(this.length===1){var F=this.pushStack([],"find",E);F.length=0;o.find(E,this[0],F);return F}else{return this.pushStack(o.unique(o.map(this,function(G){return o.find(E,G)})),"find",E)}},clone:function(G){var E=this.map(function(){if(!o.support.noCloneEvent&&!o.isXMLDoc(this)){var I=this.outerHTML;if(!I){var J=this.ownerDocument.createElement("div");J.appendChild(this.cloneNode(true));I=J.innerHTML}return o.clean([I.replace(/ jQuery\d+="(?:\d+|null)"/g,"").replace(/^\s*/,"")])[0]}else{return this.cloneNode(true)}});if(G===true){var H=this.find("*").andSelf(),F=0;E.find("*").andSelf().each(function(){if(this.nodeName!==H[F].nodeName){return}var I=o.data(H[F],"events");for(var K in I){for(var J in I[K]){o.event.add(this,K,I[K][J],I[K][J].data)}}F++})}return E},filter:function(E){return this.pushStack(o.isFunction(E)&&o.grep(this,function(G,F){return E.call(G,F)})||o.multiFilter(E,o.grep(this,function(F){return F.nodeType===1})),"filter",E)},closest:function(E){var G=o.expr.match.POS.test(E)?o(E):null,F=0;return this.map(function(){var H=this;while(H&&H.ownerDocument){if(G?G.index(H)>-1:o(H).is(E)){o.data(H,"closest",F);return H}H=H.parentNode;F++}})},not:function(E){if(typeof E==="string"){if(f.test(E)){return this.pushStack(o.multiFilter(E,this,true),"not",E)}else{E=o.multiFilter(E,this)}}var F=E.length&&E[E.length-1]!==g&&!E.nodeType;return this.filter(function(){return F?o.inArray(this,E)<0:this!=E})},add:function(E){return this.pushStack(o.unique(o.merge(this.get(),typeof E==="string"?o(E):o.makeArray(E))))},is:function(E){return !!E&&o.multiFilter(E,this).length>0},hasClass:function(E){return !!E&&this.is("."+E)},val:function(K){if(K===g){var E=this[0];if(E){if(o.nodeName(E,"option")){return(E.attributes.value||{}).specified?E.value:E.text}if(o.nodeName(E,"select")){var I=E.selectedIndex,L=[],M=E.options,H=E.type=="select-one";if(I<0){return null}for(var F=H?I:0,J=H?I+1:M.length;F=0||o.inArray(this.name,K)>=0)}else{if(o.nodeName(this,"select")){var N=o.makeArray(K);o("option",this).each(function(){this.selected=(o.inArray(this.value,N)>=0||o.inArray(this.text,N)>=0)});if(!N.length){this.selectedIndex=-1}}else{this.value=K}}})},html:function(E){return E===g?(this[0]?this[0].innerHTML.replace(/ jQuery\d+="(?:\d+|null)"/g,""):null):this.empty().append(E)},replaceWith:function(E){return this.after(E).remove()},eq:function(E){return this.slice(E,+E+1)},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments),"slice",Array.prototype.slice.call(arguments).join(","))},map:function(E){return this.pushStack(o.map(this,function(G,F){return E.call(G,F,G)}))},andSelf:function(){return this.add(this.prevObject)},domManip:function(J,M,L){if(this[0]){var I=(this[0].ownerDocument||this[0]).createDocumentFragment(),F=o.clean(J,(this[0].ownerDocument||this[0]),I),H=I.firstChild;if(H){for(var G=0,E=this.length;G1||G>0?I.cloneNode(true):I)}}if(F){o.each(F,z)}}return this;function K(N,O){return M&&o.nodeName(N,"table")&&o.nodeName(O,"tr")?(N.getElementsByTagName("tbody")[0]||N.appendChild(N.ownerDocument.createElement("tbody"))):N}}};o.fn.init.prototype=o.fn;function z(E,F){if(F.src){o.ajax({url:F.src,async:false,dataType:"script"})}else{o.globalEval(F.text||F.textContent||F.innerHTML||"")}if(F.parentNode){F.parentNode.removeChild(F)}}function e(){return +new Date}o.extend=o.fn.extend=function(){var J=arguments[0]||{},H=1,I=arguments.length,E=false,G;if(typeof J==="boolean"){E=J;J=arguments[1]||{};H=2}if(typeof J!=="object"&&!o.isFunction(J)){J={}}if(I==H){J=this;--H}for(;H-1}},swap:function(H,G,I){var E={};for(var F in G){E[F]=H.style[F];H.style[F]=G[F]}I.call(H);for(var F in G){H.style[F]=E[F]}},css:function(H,F,J,E){if(F=="width"||F=="height"){var L,G={position:"absolute",visibility:"hidden",display:"block"},K=F=="width"?["Left","Right"]:["Top","Bottom"];function I(){L=F=="width"?H.offsetWidth:H.offsetHeight;if(E==="border"){return}o.each(K,function(){if(!E){L-=parseFloat(o.curCSS(H,"padding"+this,true))||0}if(E==="margin"){L+=parseFloat(o.curCSS(H,"margin"+this,true))||0}else{L-=parseFloat(o.curCSS(H,"border"+this+"Width",true))||0}})}if(H.offsetWidth!==0){I()}else{o.swap(H,G,I)}return Math.max(0,Math.round(L))}return o.curCSS(H,F,J)},curCSS:function(I,F,G){var L,E=I.style;if(F=="opacity"&&!o.support.opacity){L=o.attr(E,"opacity");return L==""?"1":L}if(F.match(/float/i)){F=w}if(!G&&E&&E[F]){L=E[F]}else{if(q.getComputedStyle){if(F.match(/float/i)){F="float"}F=F.replace(/([A-Z])/g,"-$1").toLowerCase();var M=q.getComputedStyle(I,null);if(M){L=M.getPropertyValue(F)}if(F=="opacity"&&L==""){L="1"}}else{if(I.currentStyle){var J=F.replace(/\-(\w)/g,function(N,O){return O.toUpperCase()});L=I.currentStyle[F]||I.currentStyle[J];if(!/^\d+(px)?$/i.test(L)&&/^\d/.test(L)){var H=E.left,K=I.runtimeStyle.left;I.runtimeStyle.left=I.currentStyle.left;E.left=L||0;L=E.pixelLeft+"px";E.left=H;I.runtimeStyle.left=K}}}}return L},clean:function(F,K,I){K=K||document;if(typeof K.createElement==="undefined"){K=K.ownerDocument||K[0]&&K[0].ownerDocument||document}if(!I&&F.length===1&&typeof F[0]==="string"){var H=/^<(\w+)\s*\/?>$/.exec(F[0]);if(H){return[K.createElement(H[1])]}}var G=[],E=[],L=K.createElement("div");o.each(F,function(P,S){if(typeof S==="number"){S+=""}if(!S){return}if(typeof S==="string"){S=S.replace(/(<(\w+)[^>]*?)\/>/g,function(U,V,T){return T.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?U:V+">"});var O=S.replace(/^\s+/,"").substring(0,10).toLowerCase();var Q=!O.indexOf("",""]||!O.indexOf("",""]||O.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"","

"]||!O.indexOf("",""]||(!O.indexOf("",""]||!O.indexOf("",""]||!o.support.htmlSerialize&&[1,"div

","

"]||[0,"",""];L.innerHTML=Q[1]+S+Q[2];while(Q[0]--){L=L.lastChild}if(!o.support.tbody){var R=/"&&!R?L.childNodes:[];for(var M=N.length-1;M>=0;--M){if(o.nodeName(N[M],"tbody")&&!N[M].childNodes.length){N[M].parentNode.removeChild(N[M])}}}if(!o.support.leadingWhitespace&&/^\s/.test(S)){L.insertBefore(K.createTextNode(S.match(/^\s*/)[0]),L.firstChild)}S=o.makeArray(L.childNodes)}if(S.nodeType){G.push(S)}else{G=o.merge(G,S)}});if(I){for(var J=0;G[J];J++){if(o.nodeName(G[J],"script")&&(!G[J].type||G[J].type.toLowerCase()==="text/javascript")){E.push(G[J].parentNode?G[J].parentNode.removeChild(G[J]):G[J])}else{if(G[J].nodeType===1){G.splice.apply(G,[J+1,0].concat(o.makeArray(G[J].getElementsByTagName("script"))))}I.appendChild(G[J])}}return E}return G},attr:function(J,G,K){if(!J||J.nodeType==3||J.nodeType==8){return g}var H=!o.isXMLDoc(J),L=K!==g;G=H&&o.props[G]||G;if(J.tagName){var F=/href|src|style/.test(G);if(G=="selected"&&J.parentNode){J.parentNode.selectedIndex}if(G in J&&H&&!F){if(L){if(G=="type"&&o.nodeName(J,"input")&&J.parentNode){throw"type property can't be changed"}J[G]=K}if(o.nodeName(J,"form")&&J.getAttributeNode(G)){return J.getAttributeNode(G).nodeValue}if(G=="tabIndex"){var I=J.getAttributeNode("tabIndex");return I&&I.specified?I.value:J.nodeName.match(/(button|input|object|select|textarea)/i)?0:J.nodeName.match(/^(a|area)$/i)&&J.href?0:g}return J[G]}if(!o.support.style&&H&&G=="style"){return o.attr(J.style,"cssText",K)}if(L){J.setAttribute(G,""+K)}var E=!o.support.hrefNormalized&&H&&F?J.getAttribute(G,2):J.getAttribute(G);return E===null?g:E}if(!o.support.opacity&&G=="opacity"){if(L){J.zoom=1;J.filter=(J.filter||"").replace(/alpha$[^)]*$/,"")+(parseInt(K)+""=="NaN"?"":"alpha(opacity="+K*100+")")}return J.filter&&J.filter.indexOf("opacity=")>=0?(parseFloat(J.filter.match(/opacity=([^)]*)/)[1])/100)+"":""}G=G.replace(/-([a-z])/ig,function(M,N){return N.toUpperCase()});if(L){J[G]=K}return J[G]},trim:function(E){return(E||"").replace(/^\s+|\s+$/g,"")},makeArray:function(G){var E=[];if(G!=null){var F=G.length;if(F==null||typeof G==="string"||o.isFunction(G)||G.setInterval){E[0]=G}else{while(F){E[--F]=G[F]}}}return E},inArray:function(G,H){for(var E=0,F=H.length;E0?this.clone(true):this).get();o.fn[F].apply(o(L[K]),I);J=J.concat(I)}return this.pushStack(J,E,G)}});o.each({removeAttr:function(E){o.attr(this,E,"");if(this.nodeType==1){this.removeAttribute(E)}},addClass:function(E){o.className.add(this,E)},removeClass:function(E){o.className.remove(this,E)},toggleClass:function(F,E){if(typeof E!=="boolean"){E=!o.className.has(this,F)}o.className[E?"add":"remove"](this,F)},remove:function(E){if(!E||o.filter(E,[this]).length){o("*",this).add([this]).each(function(){o.event.remove(this);o.removeData(this)});if(this.parentNode){this.parentNode.removeChild(this)}}},empty:function(){o(this).children().remove();while(this.firstChild){this.removeChild(this.firstChild)}}},function(E,F){o.fn[E]=function(){return this.each(F,arguments)}});function j(E,F){return E[0]&&parseInt(o.curCSS(E[0],F,true),10)||0}var h="jQuery"+e(),v=0,A={};o.extend({cache:{},data:function(F,E,G){F=F==l?A:F;var H=F[h];if(!H){H=F[h]=++v}if(E&&!o.cache[H]){o.cache[H]={}}if(G!==g){o.cache[H][E]=G}return E?o.cache[H][E]:H},removeData:function(F,E){F=F==l?A:F;var H=F[h];if(E){if(o.cache[H]){delete o.cache[H][E];E="";for(E in o.cache[H]){break}if(!E){o.removeData(F)}}}else{try{delete F[h]}catch(G){if(F.removeAttribute){F.removeAttribute(h)}}delete o.cache[H]}},queue:function(F,E,H){if(F){E=(E||"fx")+"queue";var G=o.data(F,E);if(!G||o.isArray(H)){G=o.data(F,E,o.makeArray(H))}else{if(H){G.push(H)}}}return G},dequeue:function(H,G){var E=o.queue(H,G),F=E.shift();if(!G||G==="fx"){F=E[0]}if(F!==g){F.call(H)}}});o.fn.extend({data:function(E,G){var H=E.split(".");H[1]=H[1]?"."+H[1]:"";if(G===g){var F=this.triggerHandler("getData"+H[1]+"!",[H[0]]);if(F===g&&this.length){F=o.data(this[0],E)}return F===g&&H[1]?this.data(H[0]):F}else{return this.trigger("setData"+H[1]+"!",[H[0],G]).each(function(){o.data(this,E,G)})}},removeData:function(E){return this.each(function(){o.removeData(this,E)})},queue:function(E,F){if(typeof E!=="string"){F=E;E="fx"}if(F===g){return o.queue(this[0],E)}return this.each(function(){var G=o.queue(this,E,F);if(E=="fx"&&G.length==1){G[0].call(this)}})},dequeue:function(E){return this.each(function(){o.dequeue(this,E)})}}); +/* + * Sizzle CSS Selector Engine - v0.9.3 + * Copyright 2009, The Dojo Foundation + * Released under the MIT, BSD, and GPL Licenses. + * More information: http://sizzlejs.com/ + */ +(function(){var R=/((?:$(?:\([^()]+$|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?/g,L=0,H=Object.prototype.toString;var F=function(Y,U,ab,ac){ab=ab||[];U=U||document;if(U.nodeType!==1&&U.nodeType!==9){return[]}if(!Y||typeof Y!=="string"){return ab}var Z=[],W,af,ai,T,ad,V,X=true;R.lastIndex=0;while((W=R.exec(Y))!==null){Z.push(W[1]);if(W[2]){V=RegExp.rightContext;break}}if(Z.length>1&&M.exec(Y)){if(Z.length===2&&I.relative[Z[0]]){af=J(Z[0]+Z[1],U)}else{af=I.relative[Z[0]]?[U]:F(Z.shift(),U);while(Z.length){Y=Z.shift();if(I.relative[Y]){Y+=Z.shift()}af=J(Y,af)}}}else{var ae=ac?{expr:Z.pop(),set:E(ac)}:F.find(Z.pop(),Z.length===1&&U.parentNode?U.parentNode:U,Q(U));af=F.filter(ae.expr,ae.set);if(Z.length>0){ai=E(af)}else{X=false}while(Z.length){var ah=Z.pop(),ag=ah;if(!I.relative[ah]){ah=""}else{ag=Z.pop()}if(ag==null){ag=U}I.relative[ah](ai,ag,Q(U))}}if(!ai){ai=af}if(!ai){throw"Syntax error, unrecognized expression: "+(ah||Y)}if(H.call(ai)==="[object Array]"){if(!X){ab.push.apply(ab,ai)}else{if(U.nodeType===1){for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&(ai[aa]===true||ai[aa].nodeType===1&&K(U,ai[aa]))){ab.push(af[aa])}}}else{for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&ai[aa].nodeType===1){ab.push(af[aa])}}}}}else{E(ai,ab)}if(V){F(V,U,ab,ac);if(G){hasDuplicate=false;ab.sort(G);if(hasDuplicate){for(var aa=1;aa":function(Z,U,aa){var X=typeof U==="string";if(X&&!/\W/.test(U)){U=aa?U:U.toUpperCase();for(var V=0,T=Z.length;V=0)){if(!V){T.push(Y)}}else{if(V){U[X]=false}}}}return false},ID:function(T){return T[1].replace(/\\/g,"")},TAG:function(U,T){for(var V=0;T[V]===false;V++){}return T[V]&&Q(T[V])?U[1]:U[1].toUpperCase()},CHILD:function(T){if(T[1]=="nth"){var U=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(T[2]=="even"&&"2n"||T[2]=="odd"&&"2n+1"||!/\D/.test(T[2])&&"0n+"+T[2]||T[2]);T[2]=(U[1]+(U[2]||1))-0;T[3]=U[3]-0}T[0]=L++;return T},ATTR:function(X,U,V,T,Y,Z){var W=X[1].replace(/\\/g,"");if(!Z&&I.attrMap[W]){X[1]=I.attrMap[W]}if(X[2]==="~="){X[4]=" "+X[4]+" "}return X},PSEUDO:function(X,U,V,T,Y){if(X[1]==="not"){if(X[3].match(R).length>1||/^\w/.test(X[3])){X[3]=F(X[3],null,null,U)}else{var W=F.filter(X[3],U,V,true^Y);if(!V){T.push.apply(T,W)}return false}}else{if(I.match.POS.test(X[0])||I.match.CHILD.test(X[0])){return true}}return X},POS:function(T){T.unshift(true);return T}},filters:{enabled:function(T){return T.disabled===false&&T.type!=="hidden"},disabled:function(T){return T.disabled===true},checked:function(T){return T.checked===true},selected:function(T){T.parentNode.selectedIndex;return T.selected===true},parent:function(T){return !!T.firstChild},empty:function(T){return !T.firstChild},has:function(V,U,T){return !!F(T[3],V).length},header:function(T){return/h\d/i.test(T.nodeName)},text:function(T){return"text"===T.type},radio:function(T){return"radio"===T.type},checkbox:function(T){return"checkbox"===T.type},file:function(T){return"file"===T.type},password:function(T){return"password"===T.type},submit:function(T){return"submit"===T.type},image:function(T){return"image"===T.type},reset:function(T){return"reset"===T.type},button:function(T){return"button"===T.type||T.nodeName.toUpperCase()==="BUTTON"},input:function(T){return/input|select|textarea|button/i.test(T.nodeName)}},setFilters:{first:function(U,T){return T===0},last:function(V,U,T,W){return U===W.length-1},even:function(U,T){return T%2===0},odd:function(U,T){return T%2===1},lt:function(V,U,T){return UT[3]-0},nth:function(V,U,T){return T[3]-0==U},eq:function(V,U,T){return T[3]-0==U}},filter:{PSEUDO:function(Z,V,W,aa){var U=V[1],X=I.filters[U];if(X){return X(Z,W,V,aa)}else{if(U==="contains"){return(Z.textContent||Z.innerText||"").indexOf(V[3])>=0}else{if(U==="not"){var Y=V[3];for(var W=0,T=Y.length;W=0)}}},ID:function(U,T){return U.nodeType===1&&U.getAttribute("id")===T},TAG:function(U,T){return(T==="*"&&U.nodeType===1)||U.nodeName===T},CLASS:function(U,T){return(" "+(U.className||U.getAttribute("class"))+" ").indexOf(T)>-1},ATTR:function(Y,W){var V=W[1],T=I.attrHandle[V]?I.attrHandle[V](Y):Y[V]!=null?Y[V]:Y.getAttribute(V),Z=T+"",X=W[2],U=W[4];return T==null?X==="!=":X==="="?Z===U:X==="*="?Z.indexOf(U)>=0:X==="~="?(" "+Z+" ").indexOf(U)>=0:!U?Z&&T!==false:X==="!="?Z!=U:X==="^="?Z.indexOf(U)===0:X==="$="?Z.substr(Z.length-U.length)===U:X==="|="?Z===U||Z.substr(0,U.length+1)===U+"-":false},POS:function(X,U,V,Y){var T=U[2],W=I.setFilters[T];if(W){return W(X,V,U,Y)}}}};var M=I.match.POS;for(var O in I.match){I.match[O]=RegExp(I.match[O].source+/(?![^\[]*\])(?![^$]*$)/.source)}var E=function(U,T){U=Array.prototype.slice.call(U);if(T){T.push.apply(T,U);return T}return U};try{Array.prototype.slice.call(document.documentElement.childNodes)}catch(N){E=function(X,W){var U=W||[];if(H.call(X)==="[object Array]"){Array.prototype.push.apply(U,X)}else{if(typeof X.length==="number"){for(var V=0,T=X.length;V";var T=document.documentElement;T.insertBefore(U,T.firstChild);if(!!document.getElementById(V)){I.find.ID=function(X,Y,Z){if(typeof Y.getElementById!=="undefined"&&!Z){var W=Y.getElementById(X[1]);return W?W.id===X[1]||typeof W.getAttributeNode!=="undefined"&&W.getAttributeNode("id").nodeValue===X[1]?[W]:g:[]}};I.filter.ID=function(Y,W){var X=typeof Y.getAttributeNode!=="undefined"&&Y.getAttributeNode("id");return Y.nodeType===1&&X&&X.nodeValue===W}}T.removeChild(U)})();(function(){var T=document.createElement("div");T.appendChild(document.createComment(""));if(T.getElementsByTagName("*").length>0){I.find.TAG=function(U,Y){var X=Y.getElementsByTagName(U[1]);if(U[1]==="*"){var W=[];for(var V=0;X[V];V++){if(X[V].nodeType===1){W.push(X[V])}}X=W}return X}}T.innerHTML="";if(T.firstChild&&typeof T.firstChild.getAttribute!=="undefined"&&T.firstChild.getAttribute("href")!=="#"){I.attrHandle.href=function(U){return U.getAttribute("href",2)}}})();if(document.querySelectorAll){(function(){var T=F,U=document.createElement("div");U.innerHTML="

";if(U.querySelectorAll&&U.querySelectorAll(".TEST").length===0){return}F=function(Y,X,V,W){X=X||document;if(!W&&X.nodeType===9&&!Q(X)){try{return E(X.querySelectorAll(Y),V)}catch(Z){}}return T(Y,X,V,W)};F.find=T.find;F.filter=T.filter;F.selectors=T.selectors;F.matches=T.matches})()}if(document.getElementsByClassName&&document.documentElement.getElementsByClassName){(function(){var T=document.createElement("div");T.innerHTML="

";if(T.getElementsByClassName("e").length===0){return}T.lastChild.className="e";if(T.getElementsByClassName("e").length===1){return}I.order.splice(1,0,"CLASS");I.find.CLASS=function(U,V,W){if(typeof V.getElementsByClassName!=="undefined"&&!W){return V.getElementsByClassName(U[1])}}})()}function P(U,Z,Y,ad,aa,ac){var ab=U=="previousSibling"&&!ac;for(var W=0,V=ad.length;W0){X=T;break}}}T=T[U]}ad[W]=X}}}var K=document.compareDocumentPosition?function(U,T){return U.compareDocumentPosition(T)&16}:function(U,T){return U!==T&&(U.contains?U.contains(T):true)};var Q=function(T){return T.nodeType===9&&T.documentElement.nodeName!=="HTML"||!!T.ownerDocument&&Q(T.ownerDocument)};var J=function(T,aa){var W=[],X="",Y,V=aa.nodeType?[aa]:aa;while((Y=I.match.PSEUDO.exec(T))){X+=Y[0];T=T.replace(I.match.PSEUDO,"")}T=I.relative[T]?T+"*":T;for(var Z=0,U=V.length;Z0||T.offsetHeight>0};F.selectors.filters.animated=function(T){return o.grep(o.timers,function(U){return T===U.elem}).length};o.multiFilter=function(V,T,U){if(U){V=":not("+V+")"}return F.matches(V,T)};o.dir=function(V,U){var T=[],W=V[U];while(W&&W!=document){if(W.nodeType==1){T.push(W)}W=W[U]}return T};o.nth=function(X,T,V,W){T=T||1;var U=0;for(;X;X=X[V]){if(X.nodeType==1&&++U==T){break}}return X};o.sibling=function(V,U){var T=[];for(;V;V=V.nextSibling){if(V.nodeType==1&&V!=U){T.push(V)}}return T};return;l.Sizzle=F})();o.event={add:function(I,F,H,K){if(I.nodeType==3||I.nodeType==8){return}if(I.setInterval&&I!=l){I=l}if(!H.guid){H.guid=this.guid++}if(K!==g){var G=H;H=this.proxy(G);H.data=K}var E=o.data(I,"events")||o.data(I,"events",{}),J=o.data(I,"handle")||o.data(I,"handle",function(){return typeof o!=="undefined"&&!o.event.triggered?o.event.handle.apply(arguments.callee.elem,arguments):g});J.elem=I;o.each(F.split(/\s+/),function(M,N){var O=N.split(".");N=O.shift();H.type=O.slice().sort().join(".");var L=E[N];if(o.event.specialAll[N]){o.event.specialAll[N].setup.call(I,K,O)}if(!L){L=E[N]={};if(!o.event.special[N]||o.event.special[N].setup.call(I,K,O)===false){if(I.addEventListener){I.addEventListener(N,J,false)}else{if(I.attachEvent){I.attachEvent("on"+N,J)}}}}L[H.guid]=H;o.event.global[N]=true});I=null},guid:1,global:{},remove:function(K,H,J){if(K.nodeType==3||K.nodeType==8){return}var G=o.data(K,"events"),F,E;if(G){if(H===g||(typeof H==="string"&&H.charAt(0)==".")){for(var I in G){this.remove(K,I+(H||""))}}else{if(H.type){J=H.handler;H=H.type}o.each(H.split(/\s+/),function(M,O){var Q=O.split(".");O=Q.shift();var N=RegExp("(^|\\.)"+Q.slice().sort().join(".*\\.")+"(\\.|$)");if(G[O]){if(J){delete G[O][J.guid]}else{for(var P in G[O]){if(N.test(G[O][P].type)){delete G[O][P]}}}if(o.event.specialAll[O]){o.event.specialAll[O].teardown.call(K,Q)}for(F in G[O]){break}if(!F){if(!o.event.special[O]||o.event.special[O].teardown.call(K,Q)===false){if(K.removeEventListener){K.removeEventListener(O,o.data(K,"handle"),false)}else{if(K.detachEvent){K.detachEvent("on"+O,o.data(K,"handle"))}}}F=null;delete G[O]}}})}for(F in G){break}if(!F){var L=o.data(K,"handle");if(L){L.elem=null}o.removeData(K,"events");o.removeData(K,"handle")}}},trigger:function(I,K,H,E){var G=I.type||I;if(!E){I=typeof I==="object"?I[h]?I:o.extend(o.Event(G),I):o.Event(G);if(G.indexOf("!")>=0){I.type=G=G.slice(0,-1);I.exclusive=true}if(!H){I.stopPropagation();if(this.global[G]){o.each(o.cache,function(){if(this.events&&this.events[G]){o.event.trigger(I,K,this.handle.elem)}})}}if(!H||H.nodeType==3||H.nodeType==8){return g}I.result=g;I.target=H;K=o.makeArray(K);K.unshift(I)}I.currentTarget=H;var J=o.data(H,"handle");if(J){J.apply(H,K)}if((!H[G]||(o.nodeName(H,"a")&&G=="click"))&&H["on"+G]&&H["on"+G].apply(H,K)===false){I.result=false}if(!E&&H[G]&&!I.isDefaultPrevented()&&!(o.nodeName(H,"a")&&G=="click")){this.triggered=true;try{H[G]()}catch(L){}}this.triggered=false;if(!I.isPropagationStopped()){var F=H.parentNode||H.ownerDocument;if(F){o.event.trigger(I,K,F,true)}}},handle:function(K){var J,E;K=arguments[0]=o.event.fix(K||l.event);K.currentTarget=this;var L=K.type.split(".");K.type=L.shift();J=!L.length&&!K.exclusive;var I=RegExp("(^|\\.)"+L.slice().sort().join(".*\\.")+"(\\.|$)");E=(o.data(this,"events")||{})[K.type];for(var G in E){var H=E[G];if(J||I.test(H.type)){K.handler=H;K.data=H.data;var F=H.apply(this,arguments);if(F!==g){K.result=F;if(F===false){K.preventDefault();K.stopPropagation()}}if(K.isImmediatePropagationStopped()){break}}}},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(H){if(H[h]){return H}var F=H;H=o.Event(F);for(var G=this.props.length,J;G;){J=this.props[--G];H[J]=F[J]}if(!H.target){H.target=H.srcElement||document}if(H.target.nodeType==3){H.target=H.target.parentNode}if(!H.relatedTarget&&H.fromElement){H.relatedTarget=H.fromElement==H.target?H.toElement:H.fromElement}if(H.pageX==null&&H.clientX!=null){var I=document.documentElement,E=document.body;H.pageX=H.clientX+(I&&I.scrollLeft||E&&E.scrollLeft||0)-(I.clientLeft||0);H.pageY=H.clientY+(I&&I.scrollTop||E&&E.scrollTop||0)-(I.clientTop||0)}if(!H.which&&((H.charCode||H.charCode===0)?H.charCode:H.keyCode)){H.which=H.charCode||H.keyCode}if(!H.metaKey&&H.ctrlKey){H.metaKey=H.ctrlKey}if(!H.which&&H.button){H.which=(H.button&1?1:(H.button&2?3:(H.button&4?2:0)))}return H},proxy:function(F,E){E=E||function(){return F.apply(this,arguments)};E.guid=F.guid=F.guid||E.guid||this.guid++;return E},special:{ready:{setup:B,teardown:function(){}}},specialAll:{live:{setup:function(E,F){o.event.add(this,F[0],c)},teardown:function(G){if(G.length){var E=0,F=RegExp("(^|\\.)"+G[0]+"(\\.|$)");o.each((o.data(this,"events").live||{}),function(){if(F.test(this.type)){E++}});if(E<1){o.event.remove(this,G[0],c)}}}}}};o.Event=function(E){if(!this.preventDefault){return new o.Event(E)}if(E&&E.type){this.originalEvent=E;this.type=E.type}else{this.type=E}this.timeStamp=e();this[h]=true};function k(){return false}function u(){return true}o.Event.prototype={preventDefault:function(){this.isDefaultPrevented=u;var E=this.originalEvent;if(!E){return}if(E.preventDefault){E.preventDefault()}E.returnValue=false},stopPropagation:function(){this.isPropagationStopped=u;var E=this.originalEvent;if(!E){return}if(E.stopPropagation){E.stopPropagation()}E.cancelBubble=true},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=u;this.stopPropagation()},isDefaultPrevented:k,isPropagationStopped:k,isImmediatePropagationStopped:k};var a=function(F){var E=F.relatedTarget;while(E&&E!=this){try{E=E.parentNode}catch(G){E=this}}if(E!=this){F.type=F.data;o.event.handle.apply(this,arguments)}};o.each({mouseover:"mouseenter",mouseout:"mouseleave"},function(F,E){o.event.special[E]={setup:function(){o.event.add(this,F,a,E)},teardown:function(){o.event.remove(this,F,a)}}});o.fn.extend({bind:function(F,G,E){return F=="unload"?this.one(F,G,E):this.each(function(){o.event.add(this,F,E||G,E&&G)})},one:function(G,H,F){var E=o.event.proxy(F||H,function(I){o(this).unbind(I,E);return(F||H).apply(this,arguments)});return this.each(function(){o.event.add(this,G,E,F&&H)})},unbind:function(F,E){return this.each(function(){o.event.remove(this,F,E)})},trigger:function(E,F){return this.each(function(){o.event.trigger(E,F,this)})},triggerHandler:function(E,G){if(this[0]){var F=o.Event(E);F.preventDefault();F.stopPropagation();o.event.trigger(F,G,this[0]);return F.result}},toggle:function(G){var E=arguments,F=1;while(F=0){var E=G.slice(I,G.length);G=G.slice(0,I)}var H="GET";if(J){if(o.isFunction(J)){K=J;J=null}else{if(typeof J==="object"){J=o.param(J);H="POST"}}}var F=this;o.ajax({url:G,type:H,dataType:"html",data:J,complete:function(M,L){if(L=="success"||L=="notmodified"){F.html(E?o("

").append(M.responseText.replace(//g,"")).find(E):M.responseText)}if(K){F.each(K,[M.responseText,L,M])}}});return this},serialize:function(){return o.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?o.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password|search/i.test(this.type))}).map(function(E,F){var G=o(this).val();return G==null?null:o.isArray(G)?o.map(G,function(I,H){return{name:F.name,value:I}}):{name:F.name,value:G}}).get()}});o.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(E,F){o.fn[F]=function(G){return this.bind(F,G)}});var r=e();o.extend({get:function(E,G,H,F){if(o.isFunction(G)){H=G;G=null}return o.ajax({type:"GET",url:E,data:G,success:H,dataType:F})},getScript:function(E,F){return o.get(E,null,F,"script")},getJSON:function(E,F,G){return o.get(E,F,G,"json")},post:function(E,G,H,F){if(o.isFunction(G)){H=G;G={}}return o.ajax({type:"POST",url:E,data:G,success:H,dataType:F})},ajaxSetup:function(E){o.extend(o.ajaxSettings,E)},ajaxSettings:{url:location.href,global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:function(){return l.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest()},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(M){M=o.extend(true,M,o.extend(true,{},o.ajaxSettings,M));var W,F=/=\?(&|$)/g,R,V,G=M.type.toUpperCase();if(M.data&&M.processData&&typeof M.data!=="string"){M.data=o.param(M.data)}if(M.dataType=="jsonp"){if(G=="GET"){if(!M.url.match(F)){M.url+=(M.url.match(/\?/)?"&":"?")+(M.jsonp||"callback")+"=?"}}else{if(!M.data||!M.data.match(F)){M.data=(M.data?M.data+"&":"")+(M.jsonp||"callback")+"=?"}}M.dataType="json"}if(M.dataType=="json"&&(M.data&&M.data.match(F)||M.url.match(F))){W="jsonp"+r++;if(M.data){M.data=(M.data+"").replace(F,"="+W+"$1")}M.url=M.url.replace(F,"="+W+"$1");M.dataType="script";l[W]=function(X){V=X;I();L();l[W]=g;try{delete l[W]}catch(Y){}if(H){H.removeChild(T)}}}if(M.dataType=="script"&&M.cache==null){M.cache=false}if(M.cache===false&&G=="GET"){var E=e();var U=M.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+E+"$2");M.url=U+((U==M.url)?(M.url.match(/\?/)?"&":"?")+"_="+E:"")}if(M.data&&G=="GET"){M.url+=(M.url.match(/\?/)?"&":"?")+M.data;M.data=null}if(M.global&&!o.active++){o.event.trigger("ajaxStart")}var Q=/^(\w+:)?\/\/([^\/?#]+)/.exec(M.url);if(M.dataType=="script"&&G=="GET"&&Q&&(Q[1]&&Q[1]!=location.protocol||Q[2]!=location.host)){var H=document.getElementsByTagName("head")[0];var T=document.createElement("script");T.src=M.url;if(M.scriptCharset){T.charset=M.scriptCharset}if(!W){var O=false;T.onload=T.onreadystatechange=function(){if(!O&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){O=true;I();L();T.onload=T.onreadystatechange=null;H.removeChild(T)}}}H.appendChild(T);return g}var K=false;var J=M.xhr();if(M.username){J.open(G,M.url,M.async,M.username,M.password)}else{J.open(G,M.url,M.async)}try{if(M.data){J.setRequestHeader("Content-Type",M.contentType)}if(M.ifModified){J.setRequestHeader("If-Modified-Since",o.lastModified[M.url]||"Thu, 01 Jan 1970 00:00:00 GMT")}J.setRequestHeader("X-Requested-With","XMLHttpRequest");J.setRequestHeader("Accept",M.dataType&&M.accepts[M.dataType]?M.accepts[M.dataType]+", */*":M.accepts._default)}catch(S){}if(M.beforeSend&&M.beforeSend(J,M)===false){if(M.global&&!--o.active){o.event.trigger("ajaxStop")}J.abort();return false}if(M.global){o.event.trigger("ajaxSend",[J,M])}var N=function(X){if(J.readyState==0){if(P){clearInterval(P);P=null;if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}}else{if(!K&&J&&(J.readyState==4||X=="timeout")){K=true;if(P){clearInterval(P);P=null}R=X=="timeout"?"timeout":!o.httpSuccess(J)?"error":M.ifModified&&o.httpNotModified(J,M.url)?"notmodified":"success";if(R=="success"){try{V=o.httpData(J,M.dataType,M)}catch(Z){R="parsererror"}}if(R=="success"){var Y;try{Y=J.getResponseHeader("Last-Modified")}catch(Z){}if(M.ifModified&&Y){o.lastModified[M.url]=Y}if(!W){I()}}else{o.handleError(M,J,R)}L();if(X){J.abort()}if(M.async){J=null}}}};if(M.async){var P=setInterval(N,13);if(M.timeout>0){setTimeout(function(){if(J&&!K){N("timeout")}},M.timeout)}}try{J.send(M.data)}catch(S){o.handleError(M,J,null,S)}if(!M.async){N()}function I(){if(M.success){M.success(V,R)}if(M.global){o.event.trigger("ajaxSuccess",[J,M])}}function L(){if(M.complete){M.complete(J,R)}if(M.global){o.event.trigger("ajaxComplete",[J,M])}if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}return J},handleError:function(F,H,E,G){if(F.error){F.error(H,E,G)}if(F.global){o.event.trigger("ajaxError",[H,F,G])}},active:0,httpSuccess:function(F){try{return !F.status&&location.protocol=="file:"||(F.status>=200&&F.status<300)||F.status==304||F.status==1223}catch(E){}return false},httpNotModified:function(G,E){try{var H=G.getResponseHeader("Last-Modified");return G.status==304||H==o.lastModified[E]}catch(F){}return false},httpData:function(J,H,G){var F=J.getResponseHeader("content-type"),E=H=="xml"||!H&&F&&F.indexOf("xml")>=0,I=E?J.responseXML:J.responseText;if(E&&I.documentElement.tagName=="parsererror"){throw"parsererror"}if(G&&G.dataFilter){I=G.dataFilter(I,H)}if(typeof I==="string"){if(H=="script"){o.globalEval(I)}if(H=="json"){I=l["eval"]("("+I+")")}}return I},param:function(E){var G=[];function H(I,J){G[G.length]=encodeURIComponent(I)+"="+encodeURIComponent(J)}if(o.isArray(E)||E.jquery){o.each(E,function(){H(this.name,this.value)})}else{for(var F in E){if(o.isArray(E[F])){o.each(E[F],function(){H(F,this)})}else{H(F,o.isFunction(E[F])?E[F]():E[F])}}}return G.join("&").replace(/%20/g,"+")}});var m={},n,d=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];function t(F,E){var G={};o.each(d.concat.apply([],d.slice(0,E)),function(){G[this]=F});return G}o.fn.extend({show:function(J,L){if(J){return this.animate(t("show",3),J,L)}else{for(var H=0,F=this.length;H").appendTo("body");K=I.css("display");if(K==="none"){K="block"}I.remove();m[G]=K}o.data(this[H],"olddisplay",K)}}for(var H=0,F=this.length;H=0;H--){if(G[H].elem==this){if(E){G[H](true)}G.splice(H,1)}}});if(!E){this.dequeue()}return this}});o.each({slideDown:t("show",1),slideUp:t("hide",1),slideToggle:t("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(E,F){o.fn[E]=function(G,H){return this.animate(F,G,H)}});o.extend({speed:function(G,H,F){var E=typeof G==="object"?G:{complete:F||!F&&H||o.isFunction(G)&&G,duration:G,easing:F&&H||H&&!o.isFunction(H)&&H};E.duration=o.fx.off?0:typeof E.duration==="number"?E.duration:o.fx.speeds[E.duration]||o.fx.speeds._default;E.old=E.complete;E.complete=function(){if(E.queue!==false){o(this).dequeue()}if(o.isFunction(E.old)){E.old.call(this)}};return E},easing:{linear:function(G,H,E,F){return E+F*G},swing:function(G,H,E,F){return((-Math.cos(G*Math.PI)/2)+0.5)*F+E}},timers:[],fx:function(F,E,G){this.options=E;this.elem=F;this.prop=G;if(!E.orig){E.orig={}}}});o.fx.prototype={update:function(){if(this.options.step){this.options.step.call(this.elem,this.now,this)}(o.fx.step[this.prop]||o.fx.step._default)(this);if((this.prop=="height"||this.prop=="width")&&this.elem.style){this.elem.style.display="block"}},cur:function(F){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null)){return this.elem[this.prop]}var E=parseFloat(o.css(this.elem,this.prop,F));return E&&E>-10000?E:parseFloat(o.curCSS(this.elem,this.prop))||0},custom:function(I,H,G){this.startTime=e();this.start=I;this.end=H;this.unit=G||this.unit||"px";this.now=this.start;this.pos=this.state=0;var E=this;function F(J){return E.step(J)}F.elem=this.elem;if(F()&&o.timers.push(F)&&!n){n=setInterval(function(){var K=o.timers;for(var J=0;J=this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var E=true;for(var F in this.options.curAnim){if(this.options.curAnim[F]!==true){E=false}}if(E){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(o.css(this.elem,"display")=="none"){this.elem.style.display="block"}}if(this.options.hide){o(this.elem).hide()}if(this.options.hide||this.options.show){for(var I in this.options.curAnim){o.attr(this.elem.style,I,this.options.orig[I])}}this.options.complete.call(this.elem)}return false}else{var J=G-this.startTime;this.state=J/this.options.duration;this.pos=o.easing[this.options.easing||(o.easing.swing?"swing":"linear")](this.state,J,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update()}return true}};o.extend(o.fx,{speeds:{slow:600,fast:200,_default:400},step:{opacity:function(E){o.attr(E.elem.style,"opacity",E.now)},_default:function(E){if(E.elem.style&&E.elem.style[E.prop]!=null){E.elem.style[E.prop]=E.now+E.unit}else{E.elem[E.prop]=E.now}}}});if(document.documentElement.getBoundingClientRect){o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}var G=this[0].getBoundingClientRect(),J=this[0].ownerDocument,F=J.body,E=J.documentElement,L=E.clientTop||F.clientTop||0,K=E.clientLeft||F.clientLeft||0,I=G.top+(self.pageYOffset||o.boxModel&&E.scrollTop||F.scrollTop)-L,H=G.left+(self.pageXOffset||o.boxModel&&E.scrollLeft||F.scrollLeft)-K;return{top:I,left:H}}}else{o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}o.offset.initialized||o.offset.initialize();var J=this[0],G=J.offsetParent,F=J,O=J.ownerDocument,M,H=O.documentElement,K=O.body,L=O.defaultView,E=L.getComputedStyle(J,null),N=J.offsetTop,I=J.offsetLeft;while((J=J.parentNode)&&J!==K&&J!==H){M=L.getComputedStyle(J,null);N-=J.scrollTop,I-=J.scrollLeft;if(J===G){N+=J.offsetTop,I+=J.offsetLeft;if(o.offset.doesNotAddBorder&&!(o.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(J.tagName))){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}F=G,G=J.offsetParent}if(o.offset.subtractsBorderForOverflowNotVisible&&M.overflow!=="visible"){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}E=M}if(E.position==="relative"||E.position==="static"){N+=K.offsetTop,I+=K.offsetLeft}if(E.position==="fixed"){N+=Math.max(H.scrollTop,K.scrollTop),I+=Math.max(H.scrollLeft,K.scrollLeft)}return{top:N,left:I}}}o.offset={initialize:function(){if(this.initialized){return}var L=document.body,F=document.createElement("div"),H,G,N,I,M,E,J=L.style.marginTop,K='

';M={position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"};for(E in M){F.style[E]=M[E]}F.innerHTML=K;L.insertBefore(F,L.firstChild);H=F.firstChild,G=H.firstChild,I=H.nextSibling.firstChild.firstChild;this.doesNotAddBorder=(G.offsetTop!==5);this.doesAddBorderForTableAndCells=(I.offsetTop===5);H.style.overflow="hidden",H.style.position="relative";this.subtractsBorderForOverflowNotVisible=(G.offsetTop===-5);L.style.marginTop="1px";this.doesNotIncludeMarginInBodyOffset=(L.offsetTop===0);L.style.marginTop=J;L.removeChild(F);this.initialized=true},bodyOffset:function(E){o.offset.initialized||o.offset.initialize();var G=E.offsetTop,F=E.offsetLeft;if(o.offset.doesNotIncludeMarginInBodyOffset){G+=parseInt(o.curCSS(E,"marginTop",true),10)||0,F+=parseInt(o.curCSS(E,"marginLeft",true),10)||0}return{top:G,left:F}}};o.fn.extend({position:function(){var I=0,H=0,F;if(this[0]){var G=this.offsetParent(),J=this.offset(),E=/^body|html$/i.test(G[0].tagName)?{top:0,left:0}:G.offset();J.top-=j(this,"marginTop");J.left-=j(this,"marginLeft");E.top+=j(G,"borderTopWidth");E.left+=j(G,"borderLeftWidth");F={top:J.top-E.top,left:J.left-E.left}}return F},offsetParent:function(){var E=this[0].offsetParent||document.body;while(E&&(!/^body|html$/i.test(E.tagName)&&o.css(E,"position")=="static")){E=E.offsetParent}return o(E)}});o.each(["Left","Top"],function(F,E){var G="scroll"+E;o.fn[G]=function(H){if(!this[0]){return null}return H!==g?this.each(function(){this==l||this==document?l.scrollTo(!F?H:o(l).scrollLeft(),F?H:o(l).scrollTop()):this[G]=H}):this[0]==l||this[0]==document?self[F?"pageYOffset":"pageXOffset"]||o.boxModel&&document.documentElement[G]||document.body[G]:this[0][G]}});o.each(["Height","Width"],function(I,G){var E=I?"Left":"Top",H=I?"Right":"Bottom",F=G.toLowerCase();o.fn["inner"+G]=function(){return this[0]?o.css(this[0],F,false,"padding"):null};o.fn["outer"+G]=function(K){return this[0]?o.css(this[0],F,false,K?"margin":"border"):null};var J=G.toLowerCase();o.fn[J]=function(K){return this[0]==l?document.compatMode=="CSS1Compat"&&document.documentElement["client"+G]||document.body["client"+G]:this[0]==document?Math.max(document.documentElement["client"+G],document.body["scroll"+G],document.documentElement["scroll"+G],document.body["offset"+G],document.documentElement["offset"+G]):K===g?(this.length?o.css(this[0],J):null):this.css(J,typeof K==="string"?K:K+"px")}})})(); \ No newline at end of file diff --git a/testapp/static/exam/css/question.css b/testapp/static/exam/css/question.css new file mode 100644 index 0000000..a4abdf5 --- /dev/null +++ b/testapp/static/exam/css/question.css @@ -0,0 +1,11 @@ +.time-div +{ + background-color:red; + border:2px solid black; + padding: 2px; + vertical-align:middle; + width:auto; + height:12px; + float:right; + border-radius: 6px 6px 6px 6px; +} diff --git a/testapp/static/exam/css/question_quiz.css b/testapp/static/exam/css/question_quiz.css index 643e5c6..1668bad 100644 --- a/testapp/static/exam/css/question_quiz.css +++ b/testapp/static/exam/css/question_quiz.css @@ -3,3 +3,12 @@ table th, table td text-align: left; } +.mini-text +{ + height : 9px; + width : 30px; +} +.select-type +{ + width : 80px; +} diff --git a/testapp/templates/exam/add_question.html b/testapp/templates/exam/add_question.html index 8bccb66..6c1d533 100644 --- a/testapp/templates/exam/add_question.html +++ b/testapp/templates/exam/add_question.html @@ -1,32 +1,142 @@ {% extends "manage.html" %} + {% block subtitle %}Add Question{% endblock %} +{% block css %} + +{% endblock %} + {% block script %} - + {% endblock %} -{% block css %} - -{% endblock %} + +{% block onload %} onload='javascript:textareaformat();' {% endblock %} {% block manage %} - + {% csrf_token %} -Look of Question in HTML Format : -

- - {{ form.as_table }} -

- + Summary: {{ form.summary }}{{ form.summary.errors }} + Points:{{ form.points }}{{ form.points.errors }} Active: {{ form.active }}{{form.active.errors}} Type: {{ form.type }}{{form.type.errors}} + Rendered:

+ Description: {{ form.description}} {{form.description.errors}} + Test: {{ form.test }}{{form.test.errors}} + Options: {{ form.options }} {{form.options.errors}} + - {% endblock %} + diff --git a/testapp/templates/exam/complete.html b/testapp/templates/exam/complete.html index dfeee6c..a2e673b 100644 --- a/testapp/templates/exam/complete.html +++ b/testapp/templates/exam/complete.html @@ -7,5 +7,6 @@

Good bye!

You may now close the browser.

+ Login Again {% endblock content %} diff --git a/testapp/templates/exam/edit_question.html b/testapp/templates/exam/edit_question.html index b1395e9..2ab3c7a 100644 --- a/testapp/templates/exam/edit_question.html +++ b/testapp/templates/exam/edit_question.html @@ -3,70 +3,207 @@ {% block subtitle %}Edit Question{% endblock %} {% block css %} - + {% endblock %} {% block script %} {% endblock %} -{% block onload %} onload='javascript:load_form();' {% endblock %} + +{% block onload %} onload = 'javascript:textareaformat();' {% endblock %} + {% block manage %} -

+ {% csrf_token %} - - {% for form in forms %} - - {{ form.summary.value }}Show
- Look of Question in HTML Format : -

- {{ form.as_table }}

+ + {% for form in forms %} + +

{{form.summary.value}} - - -

- {% endfor %} - - {% for form in forms %} - - - {{ form.as_table }} -

- {% endfor %} + +

+ {% endfor %} +

- - {% endblock %} - diff --git a/testapp/templates/exam/grade_user.html b/testapp/templates/exam/grade_user.html index c6f6343..5ffb199 100644 --- a/testapp/templates/exam/grade_user.html +++ b/testapp/templates/exam/grade_user.html @@ -10,20 +10,17 @@ {% block script %} {% endblock %} @@ -58,23 +55,21 @@ Start time: {{ paper.start_time }}
action="{{URL_ROOT}}/exam/manage/gradeuser/{{data.user.username}}/" method="post"> {% csrf_token %} {% for question, answers in paper.get_question_answers.items %} +

- Question: {{ question.id }}. {{ question.summary }} - (Points: {{ question.points }})

- {% endfor %} {# for question, answers ... #} @@ -107,14 +104,4 @@ Marks: 1 %} -Monitor quiz -{% else %} -{% with data.papers.0 as paper %} - - Monitor quiz -{% endwith %} -{% endif %} -
-Admin {% endblock%} diff --git a/testapp/templates/exam/intro.html b/testapp/templates/exam/intro.html index ef218a2..afa596b 100644 --- a/testapp/templates/exam/intro.html +++ b/testapp/templates/exam/intro.html @@ -1,11 +1,11 @@ {% extends "base.html" %} {% block title %}Instructions and Rules {% endblock %} - -{% block content %} - {% block pagetitle %}Online Test {% endblock %} {% block formtitle %}Important instructions & rules {% endblock %} +{% block content %} + +

Welcome {{user.first_name.title}} {{user.last_name.title}}, to the programming quiz!

diff --git a/testapp/templates/exam/question.html b/testapp/templates/exam/question.html index f5dcdf4..d3da9fc 100644 --- a/testapp/templates/exam/question.html +++ b/testapp/templates/exam/question.html @@ -4,6 +4,10 @@ {% block title %} Answer question {% endblock %} +{% block css %} + +{% endblock %} + {% block script %} - + + + + {% endblock %} {% block onload %} onload='javascript:textareaformat();' {% endblock %} diff --git a/testapp/templates/exam/add_quiz.html b/testapp/templates/exam/add_quiz.html index 570b3c2..c5998d8 100644 --- a/testapp/templates/exam/add_quiz.html +++ b/testapp/templates/exam/add_quiz.html @@ -5,8 +5,11 @@ {% block css %} + {% endblock %} {% block script %} + + + + + {% endblock %} {% block onload %} onload = 'javascript:textareaformat();' {% endblock %} @@ -196,9 +35,9 @@ function autosubmit() Rendered:

Description: {{ form.description }} {{form.description.errors}} Test: {{ form.test }}{{form.test.errors}} + Tags: {{ form.tags }} Options: {{ form.options }} {{form.options.errors}} {{form.options.helptext}} -

{% endfor %} diff --git a/testapp/templates/exam/question.html b/testapp/templates/exam/question.html index b4b171e..981af7f 100644 --- a/testapp/templates/exam/question.html +++ b/testapp/templates/exam/question.html @@ -9,45 +9,7 @@ {% endblock %} {% block script %} - + {% endblock script %} {% block onload %} onload="update_time()" {% endblock onload %} diff --git a/testapp/templates/exam/show_quiz.html b/testapp/templates/exam/show_quiz.html index 684cfd2..1a4c289 100644 --- a/testapp/templates/exam/show_quiz.html +++ b/testapp/templates/exam/show_quiz.html @@ -3,33 +3,9 @@ {% block title %} Quiz List {% endblock title %} {% block script %} - + {% endblock %} + {% block subtitle %} Quiz List {% endblock %} {% block manage %} {% if not quizzes and not quiz %} diff --git a/testapp/templates/exam/showquestions.html b/testapp/templates/exam/showquestions.html index 116e747..d406522 100644 --- a/testapp/templates/exam/showquestions.html +++ b/testapp/templates/exam/showquestions.html @@ -4,31 +4,7 @@ {% block subtitle %}List of Questions {% endblock %} {% block script %} - + {% endblock %} {% block manage %} -- cgit From 246478f4ef75ae713e96a64d210bd3710bed3df9 Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Thu, 22 Mar 2012 17:50:34 +0530 Subject: Tagging functionality in quiz --- testapp/exam/forms.py | 98 ++++++++++++++----------------- testapp/exam/views.py | 37 ++++++++++-- testapp/static/exam/js/show_question.js | 60 ++++++++++++------- testapp/static/exam/js/show_quiz.js | 50 ++++++++++------ testapp/templates/exam/edit_quiz.html | 16 +++-- testapp/templates/exam/grade_user.html | 2 +- testapp/templates/exam/show_quiz.html | 4 +- testapp/templates/exam/showquestions.html | 4 +- 8 files changed, 162 insertions(+), 109 deletions(-) diff --git a/testapp/exam/forms.py b/testapp/exam/forms.py index a6844bb..f48a674 100644 --- a/testapp/exam/forms.py +++ b/testapp/exam/forms.py @@ -24,32 +24,23 @@ PWD_CHARS = letters + punctuation + digits class UserRegisterForm(forms.Form): """A Class to create new form for User's Registration. It has the various fields and functions required to register a new user to the system""" - username = forms.CharField(max_length=30, - help_text='Letters, digits, period and underscores only.') + username = forms.CharField(max_length=30, help_text='Letters, digits, period and underscores only.') email = forms.EmailField() - password = forms.CharField(max_length=30, - widget=forms.PasswordInput()) - confirm_password = forms.CharField(max_length=30, - widget=forms.PasswordInput()) + password = forms.CharField(max_length=30, widget=forms.PasswordInput()) + confirm_password = forms.CharField(max_length=30, widget=forms.PasswordInput()) first_name = forms.CharField(max_length=30) last_name = forms.CharField(max_length=30) - roll_number = forms.CharField(max_length=30, - help_text="Use a dummy if you don't have one.") - institute = forms.CharField(max_length=128, - help_text='Institute/Organization') - department = forms.CharField(max_length=64, - help_text='Department you work/study at') - position = forms.CharField(max_length=64, - help_text='Student/Faculty/Researcher/Industry/etc.') + roll_number = forms.CharField(max_length=30, help_text="Use a dummy if you don't have one.") + institute = forms.CharField(max_length=128, help_text='Institute/Organization') + department = forms.CharField(max_length=64, help_text='Department you work/study at') + position = forms.CharField(max_length=64, help_text='Student/Faculty/Researcher/Industry/etc.') def clean_username(self): u_name = self.cleaned_data["username"] - if u_name.strip(UNAME_CHARS): msg = "Only letters, digits, period and underscore characters are "\ "allowed in username" raise forms.ValidationError(msg) - try: User.objects.get(username__exact = u_name) raise forms.ValidationError("Username already exists.") @@ -100,20 +91,18 @@ class UserLoginForm(forms.Form): def clean(self): super(UserLoginForm, self).clean() - try: - u_name, pwd = self.cleaned_data["username"], self.cleaned_data["password"] - user = authenticate(username = u_name, password = pwd) - except Exception: - raise forms.ValidationError("Username and/or Password is not entered") - + try: + u_name, pwd = self.cleaned_data["username"], self.cleaned_data["password"] + user = authenticate(username = u_name, password = pwd) + except Exception: + raise forms.ValidationError("Username and/or Password is not entered") if not user: raise forms.ValidationError("Invalid username/password") - return user class QuizForm(forms.Form): """Creates a form to add or edit a Quiz. It has the related fields and functions required.""" - + start_date = forms.DateField(initial=datetime.date.today) duration = forms.IntegerField() active = forms.BooleanField(required = False) @@ -124,43 +113,42 @@ class QuizForm(forms.Form): start_date = self.cleaned_data["start_date"] duration = self.cleaned_data["duration"] active = self.cleaned_data['active'] - description = self.cleaned_data["description"] + description = self.cleaned_data["description"] - new_quiz = Quiz() - new_quiz.start_date=start_date - new_quiz.duration=duration - new_quiz.active=active - new_quiz.description=description - new_quiz.save() + new_quiz = Quiz() + new_quiz.start_date=start_date + new_quiz.duration=duration + new_quiz.active=active + new_quiz.description=description + new_quiz.save() class QuestionForm(forms.Form): - """Creates a form to add or edit a Question. It has the related fields and functions required.""" - - summary = forms.CharField(widget = forms.Textarea(attrs={'cols': 40, 'rows': 1})) - description = forms.CharField(widget = forms.Textarea(attrs={'cols': 40, 'rows': 1})) - points = forms.FloatField() - test = forms.CharField(widget = forms.Textarea(attrs={'cols': 40, 'rows': 1})) - options = forms.CharField(widget = forms.Textarea(attrs={'cols': 40, 'rows': 1}),required=False) - type = forms.CharField(max_length=8, widget=forms.Select(choices=QUESTION_TYPE_CHOICES)) - active = forms.BooleanField(required=False) - tags = TagField(widget=TagAutocomplete(),required=False) - - def save(self): + """Creates a form to add or edit a Question. It has the related fields and functions required.""" + + summary = forms.CharField(widget = forms.Textarea(attrs={'cols': 40, 'rows': 1})) + description = forms.CharField(widget = forms.Textarea(attrs={'cols': 40, 'rows': 1})) + points = forms.FloatField() + test = forms.CharField(widget = forms.Textarea(attrs={'cols': 40, 'rows': 1})) + options = forms.CharField(widget = forms.Textarea(attrs={'cols': 40, 'rows': 1}),required=False) + type = forms.CharField(max_length=8, widget=forms.Select(choices=QUESTION_TYPE_CHOICES)) + active = forms.BooleanField(required=False) + tags = TagField(widget=TagAutocomplete(),required=False) + + def save(self): summary = self.cleaned_data["summary"] description = self.cleaned_data["description"] points = self.cleaned_data['points'] - test = self.cleaned_data["test"] + test = self.cleaned_data["test"] options = self.cleaned_data['options'] - type = self.cleaned_data["type"] - active = self.cleaned_data["active"] + type = self.cleaned_data["type"] + active = self.cleaned_data["active"] new_question = Question() - new_question.summary = summary - new_question.description = description - new_question.points = points - new_question.test = test - new_question.options = options - new_question.type = type - new_question.active = active - new_question.save() - + new_question.summary = summary + new_question.description = description + new_question.points = points + new_question.test = test + new_question.options = options + new_question.type = type + new_question.active = active + new_question.save() diff --git a/testapp/exam/views.py b/testapp/exam/views.py index 325d0aa..dedf68c 100644 --- a/testapp/exam/views.py +++ b/testapp/exam/views.py @@ -111,6 +111,14 @@ def edit_quiz(request): quiz.active = active[j] quiz.description = description[j] quiz.save() + edit_tags=tags[j] + quiz.save() + for tag in quiz.tags.all(): + quiz.tags.remove(tag) + tags_split = edit_tags.split(',') + for i in range(0,len(tags_split)-1): + tag = tags_split[i].strip() + quiz.tags.add(tag) j += 1 return my_redirect("/exam/manage/showquiz/") @@ -244,7 +252,14 @@ def add_quiz(request,quiz_id=None): d.duration = form['duration'].data d.active = form['active'].data d.description = form['description'].data - d.save() + d.save() + quiz = Quiz.objects.get(id=quiz_id) + for tag in quiz.tags.all(): + quiz.tags.remove(tag) + tags = form['tags'].data.split(',') + for i in range(0,len(tags)-1): + tag = tags[i].strip() + quiz.tags.add(tag) return my_redirect("/exam/manage/showquiz") else: @@ -264,6 +279,15 @@ def add_quiz(request,quiz_id=None): form.initial['duration'] = d.duration form.initial['description']= d.description form.initial['active'] = d.active + form_tags = d.tags.all() + form_tags_split = form_tags.values('name') + initial_tags = "" + + for tag in form_tags_split: + initial_tags = initial_tags + str(tag['name']).strip() + "," + if (initial_tags == ","): + initial_tags = "" + form.initial['tags']=initial_tags return my_render_to_response('exam/add_quiz.html',{'form':form},context_instance=RequestContext(request)) @@ -582,6 +606,14 @@ def show_all_quiz(request): form.initial['duration'] = d.duration form.initial['active']= d.active form.initial['description'] = d.description + form_tags = d.tags.all() + form_tags_split = form_tags.values('name') + initial_tags = "" + for tag in form_tags_split: + initial_tags = initial_tags + str(tag['name']).strip() + "," + if (initial_tags == ","): + initial_tags = "" + form.initial['tags']=initial_tags forms.append(form) return my_render_to_response('exam/edit_quiz.html', {'forms':forms}, @@ -698,12 +730,9 @@ def grade_user(request, username): paper.save() context = {'data': data} - print context return my_render_to_response('exam/user_data.html', context, context_instance=RequestContext(request)) else: context = {'data': data} - print context return my_render_to_response('exam/grade_user.html', context, context_instance=RequestContext(request)) - diff --git a/testapp/static/exam/js/show_question.js b/testapp/static/exam/js/show_question.js index ccacbdd..e3ed1cc 100644 --- a/testapp/static/exam/js/show_question.js +++ b/testapp/static/exam/js/show_question.js @@ -1,23 +1,39 @@ function confirm_delete(frm) - { - var r = confirm("Are you Sure ?"); - if(r==false) - { - for(i=0;i - + {% endblock %} +{% block script %} + + + +{% endblock %} + +{% block onload %} onload = 'javascript:form_load();' {% endblock %} + {% block manage %}
{% csrf_token %} @@ -22,6 +25,7 @@ table th, table td Start Date: {{ form.start_date}} Duration: {{ form.duration }} Active: {{ form.active }} + Tags: {{ form.tags }} Description: {{ form.description }}
{% endfor %} diff --git a/testapp/templates/exam/grade_user.html b/testapp/templates/exam/grade_user.html index 5ffb199..7137548 100644 --- a/testapp/templates/exam/grade_user.html +++ b/testapp/templates/exam/grade_user.html @@ -63,7 +63,7 @@ Start time: {{ paper.start_time }}

Description : {{ question.description }}
-
Test : {{ question.test }}
+
Test : {{ question.test }}

diff --git a/testapp/templates/exam/show_quiz.html b/testapp/templates/exam/show_quiz.html index 1a4c289..886a696 100644 --- a/testapp/templates/exam/show_quiz.html +++ b/testapp/templates/exam/show_quiz.html @@ -24,8 +24,8 @@

   -   - +   + {% endif %} diff --git a/testapp/templates/exam/showquestions.html b/testapp/templates/exam/showquestions.html index d406522..62b40e4 100644 --- a/testapp/templates/exam/showquestions.html +++ b/testapp/templates/exam/showquestions.html @@ -15,7 +15,7 @@ {% endfor %}
   -   - +   + {% endblock %} -- cgit From 64b38d3365f1d65132942fce6e29fed7da076bba Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Wed, 28 Mar 2012 11:55:34 +0530 Subject: minor changes --- testapp/exam/urls.py | 4 ++-- testapp/exam/views.py | 21 +++++-------------- testapp/static/exam/js/edit_quiz.js | 21 +++++++++++++++++++ testapp/templates/exam/question.html | 40 +++++++++++++++++++++++++++++++++++- 4 files changed, 67 insertions(+), 19 deletions(-) create mode 100644 testapp/static/exam/js/edit_quiz.js diff --git a/testapp/exam/urls.py b/testapp/exam/urls.py index 1e1cd12..f435e63 100644 --- a/testapp/exam/urls.py +++ b/testapp/exam/urls.py @@ -3,9 +3,9 @@ from django.conf.urls.defaults import patterns, include, url urlpatterns = patterns('exam.views', url(r'^$', 'index'), url(r'^login/$', 'user_login'), - url(r'^quizlist/$', 'quizlist'), - url(r'^start/(?P\d+)/$', 'start'), + url(r'^start/$', 'start'), url(r'^quit/$', 'quit'), + url(r'^intro/$','start'), url(r'^complete/$', 'complete'), url(r'^register/$', 'user_register'), url(r'^(?P\d+)/$', 'question'), diff --git a/testapp/exam/views.py b/testapp/exam/views.py index dedf68c..5b980f5 100644 --- a/testapp/exam/views.py +++ b/testapp/exam/views.py @@ -69,7 +69,7 @@ def user_register(request): user = request.user if user.is_authenticated(): - return my_redirect("/exam/quizlist/") + return my_redirect("/exam/start/") if request.method == "POST": form = UserRegisterForm(request.POST) @@ -79,7 +79,7 @@ def user_register(request): new_user = authenticate(username = u_name, password = pwd) login(request, new_user) - return my_redirect("/exam/quizlist/") + return my_redirect("/exam/start/") else: return my_render_to_response('exam/register.html', @@ -307,7 +307,7 @@ def user_login(request): if user.is_authenticated(): if user.groups.filter(name='moderator').count() > 0 : return my_redirect('/exam/manage/') - return my_redirect("/exam/quizlist/") + return my_redirect("/exam/intro/") if request.method == "POST": form = UserLoginForm(request.POST) @@ -327,14 +327,14 @@ def user_login(request): return my_render_to_response('exam/login.html', context, context_instance=RequestContext(request)) -def start(request,quiz_id=None): +def start(request): """Check the user cedentials and if any quiz is available, start the exam.""" user = request.user try: # Right now the app is designed so there is only one active quiz # at a particular time. - quiz = Quiz.objects.get(id=quiz_id) + quiz = Quiz.objects.get(active=True) except Quiz.DoesNotExist: msg = 'Quiz not found, please contact your '\ 'instructor/administrator. Please login again thereafter.' @@ -548,17 +548,6 @@ def show_all_users(request): context = { 'question': questionpaper } return my_render_to_response('exam/showusers.html',context,context_instance=RequestContext(request)) -def quizlist(request): - """Generates a list of all the quizzes that are active for the students to attempt.""" - - quizzes = Quiz.objects.all() - context = {'papers': [], - 'quiz': None, - 'quizzes':quizzes} - return my_render_to_response('exam/quizlist.html', context, - context_instance=RequestContext(request)) - - def show_all_quiz(request): """Generates a list of all the quizzes that are currently in the database.""" diff --git a/testapp/static/exam/js/edit_quiz.js b/testapp/static/exam/js/edit_quiz.js new file mode 100644 index 0000000..610a438 --- /dev/null +++ b/testapp/static/exam/js/edit_quiz.js @@ -0,0 +1,21 @@ +function form_load() +{ + var tags = document.getElementsByName('tags'); + + for (var i=0;i + {% endblock script %} {% block onload %} onload="update_time()" {% endblock onload %} -- cgit From c0fcc1181e209192f6d11f2ca521e55e33a4ead7 Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Mon, 2 Apr 2012 18:04:43 +0530 Subject: Question Paper generator changes --- buildout.cfg | 1 + initial_fixtures.json | 1 + testapp/exam/migrations/0001_initial.py | 193 --------------------- testapp/exam/migrations/__init__.py | 0 testapp/exam/models.py | 15 +- testapp/exam/urls.py | 8 +- testapp/exam/views.py | 108 +++++++++++- testapp/settings.py | 7 + testapp/static/exam/css/base.css | 2 +- testapp/templates/exam/add_questionpaper.html | 54 ++++++ testapp/templates/exam/add_quiz.html | 3 +- .../templates/exam/automatic_questionpaper.html | 101 +++++++++++ testapp/templates/exam/editquestionpaper.html | 21 +++ testapp/templates/exam/manual_questionpaper.html | 42 +++++ testapp/templates/exam/showquestionpapers.html | 21 +++ testapp/templates/manage.html | 3 +- 16 files changed, 372 insertions(+), 208 deletions(-) create mode 100644 initial_fixtures.json delete mode 100644 testapp/exam/migrations/0001_initial.py delete mode 100644 testapp/exam/migrations/__init__.py create mode 100644 testapp/templates/exam/add_questionpaper.html create mode 100644 testapp/templates/exam/automatic_questionpaper.html create mode 100644 testapp/templates/exam/editquestionpaper.html create mode 100644 testapp/templates/exam/manual_questionpaper.html create mode 100644 testapp/templates/exam/showquestionpapers.html diff --git a/buildout.cfg b/buildout.cfg index db1c35d..02aba05 100644 --- a/buildout.cfg +++ b/buildout.cfg @@ -5,6 +5,7 @@ eggs = South django-taggit django-taggit-autocomplete-modified + django-debug-toolbar [versions] django = 1.3 diff --git a/initial_fixtures.json b/initial_fixtures.json new file mode 100644 index 0000000..f7cbceb --- /dev/null +++ b/initial_fixtures.json @@ -0,0 +1 @@ +[{"pk": 8, "model": "contenttypes.contenttype", "fields": {"model": "tag", "name": "Tag", "app_label": "taggit"}}, {"pk": 9, "model": "contenttypes.contenttype", "fields": {"model": "taggeditem", "name": "Tagged Item", "app_label": "taggit"}}, {"pk": 13, "model": "contenttypes.contenttype", "fields": {"model": "answer", "name": "answer", "app_label": "exam"}}, {"pk": 16, "model": "contenttypes.contenttype", "fields": {"model": "answerpaper", "name": "answer paper", "app_label": "exam"}}, {"pk": 4, "model": "contenttypes.contenttype", "fields": {"model": "contenttype", "name": "content type", "app_label": "contenttypes"}}, {"pk": 2, "model": "contenttypes.contenttype", "fields": {"model": "group", "name": "group", "app_label": "auth"}}, {"pk": 7, "model": "contenttypes.contenttype", "fields": {"model": "logentry", "name": "log entry", "app_label": "admin"}}, {"pk": 10, "model": "contenttypes.contenttype", "fields": {"model": "migrationhistory", "name": "migration history", "app_label": "south"}}, {"pk": 1, "model": "contenttypes.contenttype", "fields": {"model": "permission", "name": "permission", "app_label": "auth"}}, {"pk": 11, "model": "contenttypes.contenttype", "fields": {"model": "profile", "name": "profile", "app_label": "exam"}}, {"pk": 12, "model": "contenttypes.contenttype", "fields": {"model": "question", "name": "question", "app_label": "exam"}}, {"pk": 15, "model": "contenttypes.contenttype", "fields": {"model": "questionpaper", "name": "question paper", "app_label": "exam"}}, {"pk": 14, "model": "contenttypes.contenttype", "fields": {"model": "quiz", "name": "quiz", "app_label": "exam"}}, {"pk": 5, "model": "contenttypes.contenttype", "fields": {"model": "session", "name": "session", "app_label": "sessions"}}, {"pk": 6, "model": "contenttypes.contenttype", "fields": {"model": "site", "name": "site", "app_label": "sites"}}, {"pk": 3, "model": "contenttypes.contenttype", "fields": {"model": "user", "name": "user", "app_label": "auth"}}, {"pk": "b2f8681f9f910450d835f101d7bea258", "model": "sessions.session", "fields": {"expire_date": "2012-04-12T14:24:49.649", "session_data": "NDc2OTM3MDBkZDkwMDAyMGQ1NTZhNjAwZTJhMThmMzIyZGJmYjA5NzqAAn1xAS4=\n"}}, {"pk": 1, "model": "sites.site", "fields": {"domain": "example.com", "name": "example.com"}}, {"pk": 1, "model": "exam.question", "fields": {"description": "\nWrite a function called fact which takes a single integer argument\n(say n) and returns the factorial of the number. \nFor example:
\nfact(3) -> 6\n", "summary": "Factorial", "active": true, "points": 2.0, "test": "\nassert fact(0) == 1\nassert fact(5) == 120\n", "type": "python", "options": ""}}, {"pk": 2, "model": "exam.question", "fields": {"description": "Create a simple function called sqr which takes a single \nargument and returns the square of the argument. For example:
\nsqr(3) -> 9.", "summary": "Simple function", "active": true, "points": 1.0, "test": "\nimport math\nassert sqr(3) == 9\nassert abs(sqr(math.sqrt(2)) - 2.0) < 1e-14 \n ", "type": "python", "options": ""}}, {"pk": 3, "model": "exam.question", "fields": {"description": "Write a shell script which takes two arguments on the\n command line and prints the sum of the two on the output.", "summary": "Bash addition", "active": true, "points": 2.0, "test": "docs/sample.sh\ndocs/sample.args\n", "type": "bash", "options": ""}}, {"pk": 4, "model": "exam.question", "fields": {"description": "What is the largest integer value that can be represented\nin Python?", "summary": "Size of integer in Python", "active": true, "points": 0.5, "test": "No Limit", "type": "mcq", "options": "No Limit\n2**32\n2**32 - 1\nNone of the above\n"}}, {"pk": 1, "model": "exam.quiz", "fields": {"duration": 10, "active": true, "start_date": "2012-03-29", "description": "Basic Python Quiz 1"}}, {"pk": 19, "model": "auth.permission", "fields": {"codename": "add_logentry", "name": "Can add log entry", "content_type": 7}}, {"pk": 20, "model": "auth.permission", "fields": {"codename": "change_logentry", "name": "Can change log entry", "content_type": 7}}, {"pk": 21, "model": "auth.permission", "fields": {"codename": "delete_logentry", "name": "Can delete log entry", "content_type": 7}}, {"pk": 1, "model": "auth.permission", "fields": {"codename": "add_group", "name": "Can add group", "content_type": 2}}, {"pk": 4, "model": "auth.permission", "fields": {"codename": "change_group", "name": "Can change group", "content_type": 2}}, {"pk": 7, "model": "auth.permission", "fields": {"codename": "delete_group", "name": "Can delete group", "content_type": 2}}, {"pk": 2, "model": "auth.permission", "fields": {"codename": "add_permission", "name": "Can add permission", "content_type": 1}}, {"pk": 5, "model": "auth.permission", "fields": {"codename": "change_permission", "name": "Can change permission", "content_type": 1}}, {"pk": 8, "model": "auth.permission", "fields": {"codename": "delete_permission", "name": "Can delete permission", "content_type": 1}}, {"pk": 3, "model": "auth.permission", "fields": {"codename": "add_user", "name": "Can add user", "content_type": 3}}, {"pk": 6, "model": "auth.permission", "fields": {"codename": "change_user", "name": "Can change user", "content_type": 3}}, {"pk": 9, "model": "auth.permission", "fields": {"codename": "delete_user", "name": "Can delete user", "content_type": 3}}, {"pk": 10, "model": "auth.permission", "fields": {"codename": "add_contenttype", "name": "Can add content type", "content_type": 4}}, {"pk": 11, "model": "auth.permission", "fields": {"codename": "change_contenttype", "name": "Can change content type", "content_type": 4}}, {"pk": 12, "model": "auth.permission", "fields": {"codename": "delete_contenttype", "name": "Can delete content type", "content_type": 4}}, {"pk": 31, "model": "auth.permission", "fields": {"codename": "add_answer", "name": "Can add answer", "content_type": 13}}, {"pk": 37, "model": "auth.permission", "fields": {"codename": "change_answer", "name": "Can change answer", "content_type": 13}}, {"pk": 43, "model": "auth.permission", "fields": {"codename": "delete_answer", "name": "Can delete answer", "content_type": 13}}, {"pk": 32, "model": "auth.permission", "fields": {"codename": "add_answerpaper", "name": "Can add answer paper", "content_type": 16}}, {"pk": 38, "model": "auth.permission", "fields": {"codename": "change_answerpaper", "name": "Can change answer paper", "content_type": 16}}, {"pk": 44, "model": "auth.permission", "fields": {"codename": "delete_answerpaper", "name": "Can delete answer paper", "content_type": 16}}, {"pk": 33, "model": "auth.permission", "fields": {"codename": "add_profile", "name": "Can add profile", "content_type": 11}}, {"pk": 39, "model": "auth.permission", "fields": {"codename": "change_profile", "name": "Can change profile", "content_type": 11}}, {"pk": 45, "model": "auth.permission", "fields": {"codename": "delete_profile", "name": "Can delete profile", "content_type": 11}}, {"pk": 34, "model": "auth.permission", "fields": {"codename": "add_question", "name": "Can add question", "content_type": 12}}, {"pk": 40, "model": "auth.permission", "fields": {"codename": "change_question", "name": "Can change question", "content_type": 12}}, {"pk": 46, "model": "auth.permission", "fields": {"codename": "delete_question", "name": "Can delete question", "content_type": 12}}, {"pk": 35, "model": "auth.permission", "fields": {"codename": "add_questionpaper", "name": "Can add question paper", "content_type": 15}}, {"pk": 41, "model": "auth.permission", "fields": {"codename": "change_questionpaper", "name": "Can change question paper", "content_type": 15}}, {"pk": 47, "model": "auth.permission", "fields": {"codename": "delete_questionpaper", "name": "Can delete question paper", "content_type": 15}}, {"pk": 36, "model": "auth.permission", "fields": {"codename": "add_quiz", "name": "Can add quiz", "content_type": 14}}, {"pk": 42, "model": "auth.permission", "fields": {"codename": "change_quiz", "name": "Can change quiz", "content_type": 14}}, {"pk": 48, "model": "auth.permission", "fields": {"codename": "delete_quiz", "name": "Can delete quiz", "content_type": 14}}, {"pk": 13, "model": "auth.permission", "fields": {"codename": "add_session", "name": "Can add session", "content_type": 5}}, {"pk": 14, "model": "auth.permission", "fields": {"codename": "change_session", "name": "Can change session", "content_type": 5}}, {"pk": 15, "model": "auth.permission", "fields": {"codename": "delete_session", "name": "Can delete session", "content_type": 5}}, {"pk": 16, "model": "auth.permission", "fields": {"codename": "add_site", "name": "Can add site", "content_type": 6}}, {"pk": 17, "model": "auth.permission", "fields": {"codename": "change_site", "name": "Can change site", "content_type": 6}}, {"pk": 18, "model": "auth.permission", "fields": {"codename": "delete_site", "name": "Can delete site", "content_type": 6}}, {"pk": 28, "model": "auth.permission", "fields": {"codename": "add_migrationhistory", "name": "Can add migration history", "content_type": 10}}, {"pk": 29, "model": "auth.permission", "fields": {"codename": "change_migrationhistory", "name": "Can change migration history", "content_type": 10}}, {"pk": 30, "model": "auth.permission", "fields": {"codename": "delete_migrationhistory", "name": "Can delete migration history", "content_type": 10}}, {"pk": 22, "model": "auth.permission", "fields": {"codename": "add_tag", "name": "Can add Tag", "content_type": 8}}, {"pk": 24, "model": "auth.permission", "fields": {"codename": "change_tag", "name": "Can change Tag", "content_type": 8}}, {"pk": 26, "model": "auth.permission", "fields": {"codename": "delete_tag", "name": "Can delete Tag", "content_type": 8}}, {"pk": 23, "model": "auth.permission", "fields": {"codename": "add_taggeditem", "name": "Can add Tagged Item", "content_type": 9}}, {"pk": 25, "model": "auth.permission", "fields": {"codename": "change_taggeditem", "name": "Can change Tagged Item", "content_type": 9}}, {"pk": 27, "model": "auth.permission", "fields": {"codename": "delete_taggeditem", "name": "Can delete Tagged Item", "content_type": 9}}, {"pk": 1, "model": "auth.group", "fields": {"name": "moderator", "permissions": [31, 37, 43, 32, 38, 44, 33, 39, 45, 34, 40, 46, 35, 41, 47, 36, 42, 48]}}, {"pk": 1, "model": "auth.user", "fields": {"username": "hardik", "first_name": "", "last_name": "", "is_active": true, "is_superuser": true, "is_staff": true, "last_login": "2012-03-29T14:24:20.574", "groups": [], "user_permissions": [], "password": "pbkdf2_sha256$10000$lO6jpTBhhIwc$MxX0yI3Swtyzu33IWbxgRL64+pkuXN8F2Xf6kSzbTAI=", "email": "hardik@fossee.in", "date_joined": "2012-03-29T14:23:03.243"}}, {"pk": 2, "model": "auth.user", "fields": {"username": "hardy", "first_name": "", "last_name": "", "is_active": true, "is_superuser": false, "is_staff": false, "last_login": "2012-03-29T14:24:06", "groups": [1], "user_permissions": [], "password": "pbkdf2_sha256$10000$nrVGBlzheCeE$FHnLmLuY4ZoSwrW4y20d6ArwkLwmPteDbEr0fJhUmNs=", "email": "", "date_joined": "2012-03-29T14:24:06"}}, {"pk": 3, "model": "admin.logentry", "fields": {"action_flag": 2, "action_time": "2012-03-29T14:24:45.862", "object_repr": "hardy", "object_id": "2", "change_message": "Changed password and groups.", "user": 1, "content_type": 3}}, {"pk": 2, "model": "admin.logentry", "fields": {"action_flag": 1, "action_time": "2012-03-29T14:24:43.450", "object_repr": "moderator", "object_id": "1", "change_message": "", "user": 1, "content_type": 2}}, {"pk": 1, "model": "admin.logentry", "fields": {"action_flag": 1, "action_time": "2012-03-29T14:24:06.815", "object_repr": "hardy", "object_id": "2", "change_message": "", "user": 1, "content_type": 3}}] \ No newline at end of file diff --git a/testapp/exam/migrations/0001_initial.py b/testapp/exam/migrations/0001_initial.py deleted file mode 100644 index 49048cc..0000000 --- a/testapp/exam/migrations/0001_initial.py +++ /dev/null @@ -1,193 +0,0 @@ -# encoding: utf-8 -import datetime -from south.db import db -from south.v2 import SchemaMigration -from django.db import models - -class Migration(SchemaMigration): - - def forwards(self, orm): - - # Adding model 'Profile' - db.create_table('exam_profile', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('user', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['auth.User'], unique=True)), - ('roll_number', self.gf('django.db.models.fields.CharField')(max_length=20)), - ('institute', self.gf('django.db.models.fields.CharField')(max_length=128)), - ('department', self.gf('django.db.models.fields.CharField')(max_length=64)), - ('position', self.gf('django.db.models.fields.CharField')(max_length=64)), - )) - db.send_create_signal('exam', ['Profile']) - - # Adding model 'Question' - db.create_table('exam_question', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('summary', self.gf('django.db.models.fields.CharField')(max_length=256)), - ('description', self.gf('django.db.models.fields.TextField')()), - ('points', self.gf('django.db.models.fields.FloatField')(default=1.0)), - ('test', self.gf('django.db.models.fields.TextField')(blank=True)), - ('options', self.gf('django.db.models.fields.TextField')(blank=True)), - ('type', self.gf('django.db.models.fields.CharField')(max_length=24)), - ('active', self.gf('django.db.models.fields.BooleanField')(default=True)), - )) - db.send_create_signal('exam', ['Question']) - - # Adding model 'Answer' - db.create_table('exam_answer', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('question', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['exam.Question'])), - ('answer', self.gf('django.db.models.fields.TextField')()), - ('error', self.gf('django.db.models.fields.TextField')()), - ('marks', self.gf('django.db.models.fields.FloatField')(default=0.0)), - ('correct', self.gf('django.db.models.fields.BooleanField')(default=False)), - )) - db.send_create_signal('exam', ['Answer']) - - # Adding model 'Quiz' - db.create_table('exam_quiz', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('start_date', self.gf('django.db.models.fields.DateField')()), - ('duration', self.gf('django.db.models.fields.IntegerField')(default=20)), - ('active', self.gf('django.db.models.fields.BooleanField')(default=True)), - ('description', self.gf('django.db.models.fields.CharField')(max_length=256)), - )) - db.send_create_signal('exam', ['Quiz']) - - # Adding model 'QuestionPaper' - db.create_table('exam_questionpaper', ( - ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), - ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])), - ('profile', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['exam.Profile'])), - ('quiz', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['exam.Quiz'])), - ('start_time', self.gf('django.db.models.fields.DateTimeField')()), - ('user_ip', self.gf('django.db.models.fields.CharField')(max_length=15)), - ('key', self.gf('django.db.models.fields.CharField')(max_length=10)), - ('active', self.gf('django.db.models.fields.BooleanField')(default=True)), - ('questions', self.gf('django.db.models.fields.CharField')(max_length=128)), - ('questions_answered', self.gf('django.db.models.fields.CharField')(max_length=128)), - ('comments', self.gf('django.db.models.fields.TextField')()), - )) - db.send_create_signal('exam', ['QuestionPaper']) - - # Adding M2M table for field answers on 'QuestionPaper' - db.create_table('exam_questionpaper_answers', ( - ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), - ('questionpaper', models.ForeignKey(orm['exam.questionpaper'], null=False)), - ('answer', models.ForeignKey(orm['exam.answer'], null=False)) - )) - db.create_unique('exam_questionpaper_answers', ['questionpaper_id', 'answer_id']) - - - def backwards(self, orm): - - # Deleting model 'Profile' - db.delete_table('exam_profile') - - # Deleting model 'Question' - db.delete_table('exam_question') - - # Deleting model 'Answer' - db.delete_table('exam_answer') - - # Deleting model 'Quiz' - db.delete_table('exam_quiz') - - # Deleting model 'QuestionPaper' - db.delete_table('exam_questionpaper') - - # Removing M2M table for field answers on 'QuestionPaper' - db.delete_table('exam_questionpaper_answers') - - - models = { - 'auth.group': { - 'Meta': {'object_name': 'Group'}, - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), - 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) - }, - 'auth.permission': { - 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, - 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) - }, - 'auth.user': { - 'Meta': {'object_name': 'User'}, - 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), - 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), - 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), - 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), - 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) - }, - 'contenttypes.contenttype': { - 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, - 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), - 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) - }, - 'exam.answer': { - 'Meta': {'object_name': 'Answer'}, - 'answer': ('django.db.models.fields.TextField', [], {}), - 'correct': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), - 'error': ('django.db.models.fields.TextField', [], {}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'marks': ('django.db.models.fields.FloatField', [], {'default': '0.0'}), - 'question': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['exam.Question']"}) - }, - 'exam.profile': { - 'Meta': {'object_name': 'Profile'}, - 'department': ('django.db.models.fields.CharField', [], {'max_length': '64'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'institute': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'position': ('django.db.models.fields.CharField', [], {'max_length': '64'}), - 'roll_number': ('django.db.models.fields.CharField', [], {'max_length': '20'}), - 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}) - }, - 'exam.question': { - 'Meta': {'object_name': 'Question'}, - 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'description': ('django.db.models.fields.TextField', [], {}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'options': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'points': ('django.db.models.fields.FloatField', [], {'default': '1.0'}), - 'summary': ('django.db.models.fields.CharField', [], {'max_length': '256'}), - 'test': ('django.db.models.fields.TextField', [], {'blank': 'True'}), - 'type': ('django.db.models.fields.CharField', [], {'max_length': '24'}) - }, - 'exam.questionpaper': { - 'Meta': {'object_name': 'QuestionPaper'}, - 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'answers': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['exam.Answer']", 'symmetrical': 'False'}), - 'comments': ('django.db.models.fields.TextField', [], {}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'key': ('django.db.models.fields.CharField', [], {'max_length': '10'}), - 'profile': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['exam.Profile']"}), - 'questions': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'questions_answered': ('django.db.models.fields.CharField', [], {'max_length': '128'}), - 'quiz': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['exam.Quiz']"}), - 'start_time': ('django.db.models.fields.DateTimeField', [], {}), - 'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"}), - 'user_ip': ('django.db.models.fields.CharField', [], {'max_length': '15'}) - }, - 'exam.quiz': { - 'Meta': {'object_name': 'Quiz'}, - 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), - 'description': ('django.db.models.fields.CharField', [], {'max_length': '256'}), - 'duration': ('django.db.models.fields.IntegerField', [], {'default': '20'}), - 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'start_date': ('django.db.models.fields.DateField', [], {}) - } - } - - complete_apps = ['exam'] diff --git a/testapp/exam/migrations/__init__.py b/testapp/exam/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/testapp/exam/models.py b/testapp/exam/models.py index da45e7d..ad3dad8 100644 --- a/testapp/exam/models.py +++ b/testapp/exam/models.py @@ -105,9 +105,13 @@ class Quiz(models.Model): desc = self.description or 'Quiz' return '%s: on %s for %d minutes'%(desc, self.start_date, self.duration) - ################################################################################ class QuestionPaper(models.Model): + quiz = models.ForeignKey(Quiz) + questions = models.ManyToManyField(Question) + +################################################################################ +class AnswerPaper(models.Model): """A question paper for a student -- one per student typically. """ # The user taking this question paper. @@ -118,21 +122,14 @@ class QuestionPaper(models.Model): profile = models.ForeignKey(Profile) # The Quiz to which this question paper is attached to. - quiz = models.ForeignKey(Quiz) + question_paper = models.ForeignKey(QuestionPaper) # The time when this paper was started by the user. start_time = models.DateTimeField() # User's IP which is logged. user_ip = models.CharField(max_length=15) - # Unused currently. - key = models.CharField(max_length=10) - # used to allow/stop a user from retaking the question paper. - active = models.BooleanField(default = True) - - # The questions (a list of ids separated by '|') - questions = models.CharField(max_length=128) # The questions successfully answered (a list of ids separated by '|') questions_answered = models.CharField(max_length=128) diff --git a/testapp/exam/urls.py b/testapp/exam/urls.py index f435e63..4651204 100644 --- a/testapp/exam/urls.py +++ b/testapp/exam/urls.py @@ -24,9 +24,15 @@ urlpatterns = patterns('exam.views', url(r'^manage/questions/$', 'show_all_questions'), url(r'^manage/showquiz/$','show_all_quiz'), url(r'^manage/monitor/$', 'monitor'), + url(r'^manage/showquestionpapers/$','show_all_questionpapers'), + url(r'^manage/showquestionpapers/(?P\d+)/$', 'show_all_questionpapers'), url(r'^manage/monitor/(?P\d+)/$', 'monitor'), url(r'^manage/user_data/(?P[a-zA-Z0-9_.]+)/$', 'user_data'), - + url(r'^manage/designquestionpaper/$','design_questionpaper'), + url(r'^manage/designquestionpaper/(?P\d+)/$', 'design_questionpaper'), + url(r'^manage/designquestionpaper/automatic/(?P\d+)/$','automatic_questionpaper'), + url(r'^manage/designquestionpaper/automatic$','automatic_questionpaper'), + url(r'^manage/designquestionpaper/manual$','manual_questionpaper'), ) diff --git a/testapp/exam/views.py b/testapp/exam/views.py index 5b980f5..464bc3c 100644 --- a/testapp/exam/views.py +++ b/testapp/exam/views.py @@ -11,7 +11,8 @@ from django.shortcuts import render_to_response, get_object_or_404, redirect from django.template import RequestContext from django.http import Http404 from django.db.models import Sum - +from taggit.models import Tag +from itertools import chain # Local imports. from exam.models import Quiz, Question, QuestionPaper, Profile, Answer, User from exam.forms import UserRegisterForm, UserLoginForm, QuizForm , QuestionForm @@ -20,6 +21,8 @@ from settings import URL_ROOT # The directory where user data can be saved. OUTPUT_DIR = abspath(join(dirname(__file__), pardir, 'output')) +set1 = set() +set2 = set() def my_redirect(url): """An overridden redirect to deal with URL_ROOT-ing. See settings.py @@ -245,7 +248,7 @@ def add_quiz(request,quiz_id=None): for tag in tags: tag = tag.strip() quiz.tags.add(tag) - return my_redirect("/exam/manage/showquiz") + return my_redirect("/exam/manage/designquestionpaper") else: d = Quiz.objects.get(id=quiz_id) d.start_date = form['start_date'].data @@ -291,6 +294,107 @@ def add_quiz(request,quiz_id=None): return my_render_to_response('exam/add_quiz.html',{'form':form},context_instance=RequestContext(request)) +def design_questionpaper(request,questionpaper_id=None): + user=request.user + if not user.is_authenticated() or user.groups.filter(name='moderator').count() == 0 : + raise Http404('You are not allowed to view this page!') + return my_render_to_response('exam/add_questionpaper.html',{},context_instance=RequestContext(request)) + + +def show_all_questionpapers(request,questionpaper_id=None): + user=request.user + if not user.is_authenticated() or user.groups.filter(name='moderator').count() == 0 : + raise Http404('You are not allowed to view this page!') + + if request.method=="POST" and request.POST.get('add') == "add": + return my_redirect("/exam/manage/designquestionpaper/" + questionpaper_id) + + if questionpaper_id == None: + qu_papers = QuestionPaper.objects.all() + context = {'papers':qu_papers} + return my_render_to_response('exam/showquestionpapers.html',context,context_instance=RequestContext(request)) + else: + qu_papers = QuestionPaper.objects.get(id=questionpaper_id) + quiz = qu_papers.quiz + questions = qu_papers.questions.all() + q = [] + for i in questions: + q.append(i) + context = {'papers':{'quiz':quiz,'questions':q}} + return my_render_to_response('exam/editquestionpaper.html',context,context_instance=RequestContext(request)) + + +def automatic_questionpaper(request,questionpaper_id=None): + + user=request.user + global set1 + global set2 + if not user.is_authenticated() or user.groups.filter(name='moderator').count() == 0 : + raise Http404('You are not allowed to view this page!') + + if questionpaper_id == None: + if request.method=="POST": + if request.POST.get('save') == 'save' : + quiz = Quiz.objects.order_by("-id")[0] + quest_paper = QuestionPaper() + quest_paper.quiz = quiz + quest_paper.save() + for i in set2: + print str(i.id) + " " + i.summary + q = Question.objects.get(summary=i) + quest_paper.questions.add(q) + return my_redirect('/exam/manage/showquiz') + else: + set1 = set() + set2 = set() + no_questions = int(request.POST.get('questions')) + first_tag = request.POST.get('first_tag') + first_condition = request.POST.get('first_condition') + second_tag = request.POST.get('second_tag') + second_condition = request.POST.get('second_condition') + third_tag = request.POST.get('third_tag') + question1 = set(Question.objects.filter(tags__name__in=[first_tag])) + question2 = set(Question.objects.filter(tags__name__in=[second_tag])) + question3 = set(Question.objects.filter(tags__name__in=[third_tag])) + if first_condition == 'and': + set1 = question1.intersection(question2) + if second_condition == 'and': + set2 = set1.intersection(question3) + else: + set2 = set1.union(question3) + else: + set1 = question1.union(question2) + if second_condition == 'and': + set2 = set1.intersection(question3) + else: + set2 = set1.union(question3) + n = len(set2) + msg = '' + if (no_questions < n ) : + i = n - no_questions + for i in range(0,i): + set2.pop() + elif( no_questions > n): + msg = 'The given Criteria does not satisfy the number of Questions...' + tags = Tag.objects.all() + context = {'data':{'questions':set2,'tags':tags,'msg':msg}} + return my_render_to_response('exam/automatic_questionpaper.html',context,context_instance=RequestContext(request)) + else: + tags = Tag.objects.all() + context = {'data':{'tags':tags}} + return my_render_to_response('exam/automatic_questionpaper.html',context,context_instance=RequestContext(request)) + + else: + return HttpResponse("eni mane pochi gaya ayan... ") + +def manual_questionpaper(request): + user=request.user + if not user.is_authenticated() or user.groups.filter(name='moderator').count() == 0 : + raise Http404('You are not allowed to view this page!') + return my_render_to_response('exam/manual_questionpaper.html',{},context_instance=RequestContext(request)) + + + def prof_manage(request): """Take credentials of the user with professor/moderator rights/permissions and log in.""" diff --git a/testapp/settings.py b/testapp/settings.py index 6edf08c..92a597b 100644 --- a/testapp/settings.py +++ b/testapp/settings.py @@ -123,6 +123,8 @@ MIDDLEWARE_CLASSES = ( 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', + 'debug_toolbar.middleware.DebugToolbarMiddleware', + ) ROOT_URLCONF = '%s.urls'%(basename(CURDIR)) @@ -149,6 +151,8 @@ INSTALLED_APPS = ( 'south', 'exam', 'taggit_autocomplete_modified', + 'debug_toolbar', + 'django_extensions', ) # A sample logging configuration. The only tangible logging @@ -188,3 +192,6 @@ LOGGING = { } AUTH_PROFILE_MODULE = 'exam.Profile' + +INTERNAL_IPS = ('127.0.0.1',) + diff --git a/testapp/static/exam/css/base.css b/testapp/static/exam/css/base.css index e1adc48..c822f4d 100644 --- a/testapp/static/exam/css/base.css +++ b/testapp/static/exam/css/base.css @@ -631,7 +631,7 @@ textarea { } select { - width : 80px; + width : auto; } label { padding-top: 6px; diff --git a/testapp/templates/exam/add_questionpaper.html b/testapp/templates/exam/add_questionpaper.html new file mode 100644 index 0000000..664093c --- /dev/null +++ b/testapp/templates/exam/add_questionpaper.html @@ -0,0 +1,54 @@ +{% extends "manage.html" %} + + +{% block subtitle %}Design Question Paper{% endblock %} + +{% block css %} + + +{% endblock %} +{% block script %} + + + + +{% endblock %} + +{% block manage %} +
+{% csrf_token %} +Select mode to design Question Paper: + +
+ + +{% endblock %} diff --git a/testapp/templates/exam/add_quiz.html b/testapp/templates/exam/add_quiz.html index c5998d8..c8e1ac3 100644 --- a/testapp/templates/exam/add_quiz.html +++ b/testapp/templates/exam/add_quiz.html @@ -27,7 +27,8 @@ {{ form.as_table }} - + + {% endblock %} diff --git a/testapp/templates/exam/automatic_questionpaper.html b/testapp/templates/exam/automatic_questionpaper.html new file mode 100644 index 0000000..b961711 --- /dev/null +++ b/testapp/templates/exam/automatic_questionpaper.html @@ -0,0 +1,101 @@ +{% extends "manage.html" %} + + +{% block subtitle %}Design Question Paper{% endblock %} + +{% block css %} + + + +{% endblock %} +{% block script %} + + + + +{% endblock %} + +{% block manage %} +Automotic mode to design the Question Paper
+ +
+ {% csrf_token %} + + Tag Conditions: + + + + + + + + + + + +
+ + Number of question:
+ +
+
+
Below is the list of Questions fetched according to the given tag conditions
+
+ + +
+ {% endfor %} +
Summary + Type + Points + Tags + {% for question in data.questions %} +
{{ question.summary }} {{ question.type }} {{ question.points }} + {% for tag in question.tags.all %} + {{ tag }} + {% endfor %} +
+ {% if data.msg %}
{{ data.msg }}
{% endif %} + + + +{% endblock %} diff --git a/testapp/templates/exam/editquestionpaper.html b/testapp/templates/exam/editquestionpaper.html new file mode 100644 index 0000000..68a9c22 --- /dev/null +++ b/testapp/templates/exam/editquestionpaper.html @@ -0,0 +1,21 @@ +{% extends "manage.html" %} + + +{% block subtitle %}Questions in "{{ papers.quiz.description }}"{% endblock %} + +{% block script %} + +{% endblock %} + +{% block manage %} +
+{% csrf_token %} + +{% for i in papers.questions %} +  {{ i.summary}}
+{% endfor %} +
+   + +
+{% endblock %} diff --git a/testapp/templates/exam/manual_questionpaper.html b/testapp/templates/exam/manual_questionpaper.html new file mode 100644 index 0000000..96370c0 --- /dev/null +++ b/testapp/templates/exam/manual_questionpaper.html @@ -0,0 +1,42 @@ +{% extends "manage.html" %} + + +{% block subtitle %}Design Question Paper{% endblock %} + +{% block css %} + + +{% endblock %} +{% block script %} + + + + +{% endblock %} + +{% block manage %} +
+{% csrf_token %} +Select mode to design Question Paper: + +
+ + + +{% endblock %} diff --git a/testapp/templates/exam/showquestionpapers.html b/testapp/templates/exam/showquestionpapers.html new file mode 100644 index 0000000..7a77d2f --- /dev/null +++ b/testapp/templates/exam/showquestionpapers.html @@ -0,0 +1,21 @@ +{% extends "manage.html" %} + + +{% block subtitle %}List of Question Papers {% endblock %} + +{% block script %} + +{% endblock %} + +{% block manage %} +
+{% csrf_token %} +{% for i in papers %} +  {{ i.quiz.description }}
+{% endfor %} +
+   +   + +
+{% endblock %} diff --git a/testapp/templates/manage.html b/testapp/templates/manage.html index 43578f7..0f122b0 100644 --- a/testapp/templates/manage.html +++ b/testapp/templates/manage.html @@ -30,8 +30,9 @@

Questions

Quizzes
+
Question Papers

Grade User
-
Monitor
+
Monitor

Log out
-- cgit From 5d7ab20a710e2374a3345b07ed62154456dbd2c8 Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Sat, 14 Apr 2012 06:28:44 +0530 Subject: model changes as per requirnment --- buildout.cfg | 1 + testapp/exam/models.py | 11 +- testapp/exam/urls.py | 1 + testapp/exam/views.py | 197 ++++++++++++++++++++--- testapp/settings.py | 2 +- testapp/templates/exam/manual_questionpaper.html | 69 ++++++-- testapp/templates/exam/showquestionpapers.html | 2 - 7 files changed, 245 insertions(+), 38 deletions(-) diff --git a/buildout.cfg b/buildout.cfg index 02aba05..486e68e 100644 --- a/buildout.cfg +++ b/buildout.cfg @@ -7,6 +7,7 @@ eggs = django-taggit-autocomplete-modified django-debug-toolbar +versions = versions [versions] django = 1.3 diff --git a/testapp/exam/models.py b/testapp/exam/models.py index ad3dad8..dd0c033 100644 --- a/testapp/exam/models.py +++ b/testapp/exam/models.py @@ -2,7 +2,7 @@ import datetime from django.db import models from django.contrib.auth.models import User from taggit_autocomplete_modified.managers import TaggableManagerAutocomplete as TaggableManager - +from django.http import HttpResponse ################################################################################ class Profile(models.Model): """Profile for a user to store roll number and other details.""" @@ -120,7 +120,10 @@ class AnswerPaper(models.Model): # The user's profile, we store a reference to make it easier to access the # data. profile = models.ForeignKey(Profile) - + + # All questions that remains to attempt to perticular Student + questions = models.CharField(max_length=128) + # The Quiz to which this question paper is attached to. question_paper = models.ForeignKey(QuestionPaper) @@ -157,7 +160,7 @@ class AnswerPaper(models.Model): def completed_question(self, question_id): """Removes the question from the list of questions and returns - the next.""" +the next.""" qa = self.questions_answered if len(qa) > 0: self.questions_answered = '|'.join([qa, str(question_id)]) @@ -193,7 +196,7 @@ class AnswerPaper(models.Model): except AttributeError: # total_seconds is new in Python 2.7. :( secs = dt.seconds + dt.days*24*3600 - total = self.quiz.duration*60.0 + total = self.question_paper.quiz.duration*60.0 remain = max(total - secs, 0) return int(remain) diff --git a/testapp/exam/urls.py b/testapp/exam/urls.py index 4651204..e7284f2 100644 --- a/testapp/exam/urls.py +++ b/testapp/exam/urls.py @@ -33,6 +33,7 @@ urlpatterns = patterns('exam.views', url(r'^manage/designquestionpaper/automatic/(?P\d+)/$','automatic_questionpaper'), url(r'^manage/designquestionpaper/automatic$','automatic_questionpaper'), url(r'^manage/designquestionpaper/manual$','manual_questionpaper'), + url(r'^manage/designquestionpaper/manual/(?P\d+)/$','manual_questionpaper'), ) diff --git a/testapp/exam/views.py b/testapp/exam/views.py index 464bc3c..b742785 100644 --- a/testapp/exam/views.py +++ b/testapp/exam/views.py @@ -14,7 +14,7 @@ from django.db.models import Sum from taggit.models import Tag from itertools import chain # Local imports. -from exam.models import Quiz, Question, QuestionPaper, Profile, Answer, User +from exam.models import Quiz, Question, QuestionPaper, Profile, Answer, AnswerPaper, User from exam.forms import UserRegisterForm, UserLoginForm, QuizForm , QuestionForm from exam.xmlrpc_clients import code_server from settings import URL_ROOT @@ -308,7 +308,19 @@ def show_all_questionpapers(request,questionpaper_id=None): if request.method=="POST" and request.POST.get('add') == "add": return my_redirect("/exam/manage/designquestionpaper/" + questionpaper_id) - + + if request.method=="POST" and request.POST.get('delete') == "delete": + data = request.POST.getlist('papers') + for i in data: + q_paper = QuestionPaper.objects.get(id=i).delete() + question_paper= QuestionPaper.objects.all() + context = {'papers': question_paper, } + return my_render_to_response('exam/showquestionpapers.html', context, + context_instance=RequestContext(request)) + qu_papers = QuestionPaper.objects.all() + context = {'papers':qu_papers} + return my_render_to_response('exam/showquestionpapers.html',context,context_instance=RequestContext(request)) + if questionpaper_id == None: qu_papers = QuestionPaper.objects.all() context = {'papers':qu_papers} @@ -340,7 +352,6 @@ def automatic_questionpaper(request,questionpaper_id=None): quest_paper.quiz = quiz quest_paper.save() for i in set2: - print str(i.id) + " " + i.summary q = Question.objects.get(summary=i) quest_paper.questions.add(q) return my_redirect('/exam/manage/showquiz') @@ -385,13 +396,152 @@ def automatic_questionpaper(request,questionpaper_id=None): return my_render_to_response('exam/automatic_questionpaper.html',context,context_instance=RequestContext(request)) else: - return HttpResponse("eni mane pochi gaya ayan... ") + if request.method=="POST": + if request.POST.get('save') == 'save' : + quest_paper = QuestionPaper.objects.get(id=questionpaper_id) + for i in set2: + print str(i.id) + " " + i.summary + q = Question.objects.get(summary=i) + quest_paper.questions.add(q) + return my_redirect('/exam/manage/showquiz') + else: + set1 = set() + set2 = set() + no_questions = int(request.POST.get('questions')) + first_tag = request.POST.get('first_tag') + first_condition = request.POST.get('first_condition') + second_tag = request.POST.get('second_tag') + second_condition = request.POST.get('second_condition') + third_tag = request.POST.get('third_tag') + question1 = set(Question.objects.filter(tags__name__in=[first_tag])) + question2 = set(Question.objects.filter(tags__name__in=[second_tag])) + question3 = set(Question.objects.filter(tags__name__in=[third_tag])) + if first_condition == 'and': + set1 = question1.intersection(question2) + if second_condition == 'and': + set2 = set1.intersection(question3) + else: + set2 = set1.union(question3) + else: + set1 = question1.union(question2) + if second_condition == 'and': + set2 = set1.intersection(question3) + else: + set2 = set1.union(question3) + n = len(set2) + msg = '' + if (no_questions < n ) : + i = n - no_questions + for i in range(0,i): + set2.pop() + elif( no_questions > n): + msg = 'The given Criteria does not satisfy the number of Questions...' + tags = Tag.objects.all() + context = {'data':{'questions':set2,'tags':tags,'msg':msg}} + return my_render_to_response('exam/automatic_questionpaper.html',context,context_instance=RequestContext(request)) + else: + tags = Tag.objects.all() + context = {'data':{'tags':tags}} + return my_render_to_response('exam/automatic_questionpaper.html',context,context_instance=RequestContext(request)) -def manual_questionpaper(request): +def manual_questionpaper(request,questionpaper_id=None): user=request.user + global set1 + global set2 if not user.is_authenticated() or user.groups.filter(name='moderator').count() == 0 : raise Http404('You are not allowed to view this page!') - return my_render_to_response('exam/manual_questionpaper.html',{},context_instance=RequestContext(request)) + + if questionpaper_id == None: + if request.method=="POST": + if request.POST.get('save') == 'save' : + questions = request.POST.getlist('questions') + quiz = Quiz.objects.order_by("-id")[0] + quest_paper = QuestionPaper() + quest_paper.quiz = quiz + quest_paper.save() + for i in questions: + q = Question.objects.get(id=i) + quest_paper.questions.add(q) + return my_redirect('/exam/manage/showquiz') + else: + set1 = set() + set2 = set() + first_tag = request.POST.get('first_tag') + first_condition = request.POST.get('first_condition') + second_tag = request.POST.get('second_tag') + second_condition = request.POST.get('second_condition') + third_tag = request.POST.get('third_tag') + question1 = set(Question.objects.filter(tags__name__in=[first_tag])) + question2 = set(Question.objects.filter(tags__name__in=[second_tag])) + question3 = set(Question.objects.filter(tags__name__in=[third_tag])) + if first_condition == 'and': + set1 = question1.intersection(question2) + if second_condition == 'and': + set2 = set1.intersection(question3) + else: + set2 = set1.union(question3) + else: + set1 = question1.union(question2) + if second_condition == 'and': + set2 = set1.intersection(question3) + else: + set2 = set1.union(question3) + n = len(set2) + msg = '' + if (n == 0) : + msg = 'No matching Question found...' + tags = Tag.objects.all() + context = {'data':{'questions':set2,'tags':tags,'msg':msg}} + return my_render_to_response('exam/manual_questionpaper.html',context,context_instance=RequestContext(request)) + else: + tags = Tag.objects.all() + context = {'data':{'tags':tags}} + return my_render_to_response('exam/manual_questionpaper.html',context,context_instance=RequestContext(request)) + + else: + if request.method=="POST": + if request.POST.get('save') == 'save' : + quest_paper = QuestionPaper.objects.get(id=questionpaper_id) + questions = request.POST.getlist('questions') + for i in questions: + q = Question.objects.get(id=i) + quest_paper.questions.add(q) + return my_redirect('/exam/manage/showquiz') + else: + set1 = set() + set2 = set() + first_tag = request.POST.get('first_tag') + first_condition = request.POST.get('first_condition') + second_tag = request.POST.get('second_tag') + second_condition = request.POST.get('second_condition') + third_tag = request.POST.get('third_tag') + question1 = set(Question.objects.filter(tags__name__in=[first_tag])) + question2 = set(Question.objects.filter(tags__name__in=[second_tag])) + question3 = set(Question.objects.filter(tags__name__in=[third_tag])) + if first_condition == 'and': + set1 = question1.intersection(question2) + if second_condition == 'and': + set2 = set1.intersection(question3) + else: + set2 = set1.union(question3) + else: + set1 = question1.union(question2) + if second_condition == 'and': + set2 = set1.intersection(question3) + else: + set2 = set1.union(question3) + n = len(set2) + msg = '' + if (n == 0) : + msg = 'No matching Question found...' + tags = Tag.objects.all() + context = {'data':{'questions':set2,'tags':tags,'msg':msg}} + return my_render_to_response('exam/manual_questionpaper.html',context,context_instance=RequestContext(request)) + else: + tags = Tag.objects.all() + context = {'data':{'tags':tags}} + return my_render_to_response('exam/manual_questionpaper.html',context,context_instance=RequestContext(request)) + @@ -438,17 +588,17 @@ def start(request): try: # Right now the app is designed so there is only one active quiz # at a particular time. - quiz = Quiz.objects.get(active=True) - except Quiz.DoesNotExist: + questionpaper = QuestionPaper.objects.all()[0] + except QuestionPaper.DoesNotExist: msg = 'Quiz not found, please contact your '\ 'instructor/administrator. Please login again thereafter.' return complete(request, reason=msg) try: - old_paper = QuestionPaper.objects.get(user=user, quiz=quiz) + old_paper = AnswerPaper.objects.get(user=user, question_paper=questionpaper) q = old_paper.current_question() return show_question(request, q) - except QuestionPaper.DoesNotExist: + except AnswerPaper.DoesNotExist: ip = request.META['REMOTE_ADDR'] key = gen_key(10) try: @@ -457,16 +607,18 @@ def start(request): msg = 'You do not have a profile and cannot take the quiz!' raise Http404(msg) - new_paper = QuestionPaper(user=user, user_ip=ip, key=key, - quiz=quiz, profile=profile) + new_paper = AnswerPaper(user=user, user_ip=ip, + question_paper=questionpaper, profile=profile) new_paper.start_time = datetime.datetime.now() # Make user directory. user_dir = get_user_dir(user) - questions = [ str(_.id) for _ in Question.objects.filter(active=True) ] + questions = [ str(_.id) for _ in questionpaper.questions.all() ] random.shuffle(questions) - + + #questions = questionpaper.questions + #random.shuffle(questions) new_paper.questions = "|".join(questions) new_paper.save() @@ -484,16 +636,17 @@ def question(request, q_id): return my_redirect('/exam/login/') q = get_object_or_404(Question, pk=q_id) try: - paper = QuestionPaper.objects.get(user=request.user, quiz__active=True) - except QuestionPaper.DoesNotExist: + q_paper = QuestionPaper.objects.get(quiz__active=True) + paper = AnswerPaper.objects.get(user=request.user, question_paper=q_paper) + except AnswerPaper.DoesNotExist: return my_redirect('/exam/start') - if not paper.quiz.active: + if not paper.question_paper.quiz.active: return complete(request, reason='The quiz has been deactivated!') time_left = paper.time_left() if time_left == 0: return complete(request, reason='Your time is up!') - quiz_name = paper.quiz.description + quiz_name = paper.question_paper.quiz.description context = {'question': q, 'paper': paper, 'user': user, 'quiz_name': quiz_name, 'time_left': time_left} @@ -503,7 +656,6 @@ def question(request, q_id): def show_question(request, q_id): """Show a question if possible.""" - if len(q_id) == 0: msg = 'Congratulations! You have successfully completed the quiz.' return complete(request, msg) @@ -517,7 +669,8 @@ def check(request, q_id): if not user.is_authenticated(): return my_redirect('/exam/login/') question = get_object_or_404(Question, pk=q_id) - paper = QuestionPaper.objects.get(user=user, quiz__active=True) + q_paper = QuestionPaper.objects.get(quiz__active=True) + paper = AnswerPaper.objects.get(user=request.user,question_paper = q_paper) answer = request.POST.get('answer') skip = request.POST.get('skip', None) @@ -557,12 +710,12 @@ def check(request, q_id): time_left = paper.time_left() if time_left == 0: return complete(request, reason='Your time is up!') - if not paper.quiz.active: + if not paper.question_paper.quiz.active: return complete(request, reason='The quiz has been deactivated!') context = {'question': question, 'error_message': err_msg, 'paper': paper, 'last_attempt': answer, - 'quiz_name': paper.quiz.description, + 'quiz_name': paper.question_paper.quiz.description, 'time_left': time_left} ci = RequestContext(request) diff --git a/testapp/settings.py b/testapp/settings.py index 92a597b..39331ce 100644 --- a/testapp/settings.py +++ b/testapp/settings.py @@ -148,7 +148,7 @@ INSTALLED_APPS = ( 'taggit', # Uncomment the next line to enable admin documentation: # 'django.contrib.admindocs', - 'south', +# 'south', 'exam', 'taggit_autocomplete_modified', 'debug_toolbar', diff --git a/testapp/templates/exam/manual_questionpaper.html b/testapp/templates/exam/manual_questionpaper.html index 96370c0..47df1ed 100644 --- a/testapp/templates/exam/manual_questionpaper.html +++ b/testapp/templates/exam/manual_questionpaper.html @@ -6,6 +6,12 @@ {% block css %} + {% endblock %} {% block script %} @@ -28,15 +34,60 @@ function load_data() {% endblock %} {% block manage %} -
-{% csrf_token %} -Select mode to design Question Paper: - -
- +Manual mode to design the Question Paper
+
+ {% csrf_token %} + + Tag Conditions: + + + + + + +
+ +

Below is the list of Questions fetched according to the given tag conditions +
+ + +
+ {% endfor %} +
+ Summary + Type + Points + Tags + {% for question in data.questions %} +
{{ question.summary }} {{ question.type }} {{ question.points }} + {% for tag in question.tags.all %} + {{ tag }} + {% endfor %} +
+ {% if data.msg %}
{{ data.msg }}
{% endif %} + + {% endblock %} diff --git a/testapp/templates/exam/showquestionpapers.html b/testapp/templates/exam/showquestionpapers.html index 7a77d2f..26b756d 100644 --- a/testapp/templates/exam/showquestionpapers.html +++ b/testapp/templates/exam/showquestionpapers.html @@ -14,8 +14,6 @@   {{ i.quiz.description }}
{% endfor %}
-   -   {% endblock %} -- cgit From 9d0a737afdb23a50b28237055c87bfa72197d99b Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Sat, 14 Apr 2012 07:24:02 +0530 Subject: minor changes as model changes --- testapp/exam/views.py | 16 ++++++++-------- testapp/templates/exam/grade_user.html | 4 ++-- testapp/templates/exam/monitor.html | 4 ++-- testapp/templates/exam/showusers.html | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/testapp/exam/views.py b/testapp/exam/views.py index b742785..5e594b2 100644 --- a/testapp/exam/views.py +++ b/testapp/exam/views.py @@ -756,20 +756,20 @@ def monitor(request, quiz_id=None): raise Http404('You are not allowed to view this page!') if quiz_id is None: - quizzes = Quiz.objects.all() + q_paper = QuestionPaper.objects.all() context = {'papers': [], 'quiz': None, - 'quizzes':quizzes} + 'quizzes':q_paper} return my_render_to_response('exam/monitor.html', context, context_instance=RequestContext(request)) # quiz_id is not None. try: - quiz = Quiz.objects.get(id=quiz_id) - except Quiz.DoesNotExist: + quiz = QuestionPaper.objects.get(id=quiz_id) + except QuestionPaper.DoesNotExist: papers = [] quiz = None else: - papers = QuestionPaper.objects.all().annotate( + papers = AnswerPaper.objects.all().annotate( total=Sum('answers__marks')).order_by('-total') context = {'papers': papers, 'quiz': quiz, 'quizzes': None} @@ -781,7 +781,7 @@ def get_user_data(username): related to the user including all the user's answers submitted. """ user = User.objects.get(username=username) - papers = QuestionPaper.objects.filter(user=user) + papers = AnswerPaper.objects.filter(user=user) data = {} try: @@ -801,7 +801,7 @@ def show_all_users(request): if not user.is_authenticated() or user.groups.filter(name='moderator').count() == 0: raise Http404('You are not allowed to view this page !') user = User.objects.filter(username__contains="") - questionpaper = QuestionPaper.objects.all() + questionpaper = AnswerPaper.objects.all() context = { 'question': questionpaper } return my_render_to_response('exam/showusers.html',context,context_instance=RequestContext(request)) @@ -972,7 +972,7 @@ def grade_user(request, username): last_ans = answers[-1] last_ans.marks = marks last_ans.save() - paper.comments = request.POST.get('comments_%d'%paper.quiz.id) + paper.comments = request.POST.get('comments_%d'%paper.question_paper.id) paper.save() context = {'data': data} diff --git a/testapp/templates/exam/grade_user.html b/testapp/templates/exam/grade_user.html index 7137548..58e118b 100644 --- a/testapp/templates/exam/grade_user.html +++ b/testapp/templates/exam/grade_user.html @@ -92,8 +92,8 @@ Marks: Teacher comments: -{{ paper.comments }} +{{ paper.comments }}

diff --git a/testapp/templates/exam/monitor.html b/testapp/templates/exam/monitor.html index 29cb6e9..aa8b678 100644 --- a/testapp/templates/exam/monitor.html +++ b/testapp/templates/exam/monitor.html @@ -27,8 +27,8 @@ {# This is rendered when we are just viewing exam/monitor #} {% if quizzes %}
-{% for quiz in quizzes %} -
{{ quiz.description }}
+{% for q in quizzes %} +
{{ q.quiz.description }}
{% endfor %}
{% endif %} diff --git a/testapp/templates/exam/showusers.html b/testapp/templates/exam/showusers.html index 603af8a..01ecc37 100644 --- a/testapp/templates/exam/showusers.html +++ b/testapp/templates/exam/showusers.html @@ -20,7 +20,7 @@ List of Users {{ papers.user.username }}
{{ papers.user.first_name.title }} {{ papers.user.last_name.title }} - {{ papers.quiz.description }} + {{ papers.question_paper.quiz.description }} {% endfor %}
{% endblock %} -- cgit From 6c0d75e784b87ed05e4c138110f987e88a37701b Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Wed, 18 Apr 2012 01:56:51 +0530 Subject: changes for student interface --- testapp/exam/models.py | 3 + testapp/exam/urls.py | 9 ++- testapp/exam/views.py | 87 ++++++++++++++++------ testapp/templates/exam/add_quiz.html | 8 +- .../templates/exam/automatic_questionpaper.html | 2 +- testapp/templates/exam/complete.html | 2 +- testapp/templates/exam/intro.html | 2 +- testapp/templates/exam/question.html | 6 +- testapp/templates/exam/quit.html | 3 +- testapp/templates/exam/quizzes_user.html | 18 +++++ testapp/templates/exam/results_user.html | 23 ++++++ testapp/templates/user.html | 58 +++++++++++++++ 12 files changed, 186 insertions(+), 35 deletions(-) create mode 100644 testapp/templates/exam/quizzes_user.html create mode 100644 testapp/templates/exam/results_user.html create mode 100644 testapp/templates/user.html diff --git a/testapp/exam/models.py b/testapp/exam/models.py index dd0c033..04789da 100644 --- a/testapp/exam/models.py +++ b/testapp/exam/models.py @@ -129,6 +129,9 @@ class AnswerPaper(models.Model): # The time when this paper was started by the user. start_time = models.DateTimeField() + + # The time when this paper was ended by the user. + end_time = models.DateTimeField() # User's IP which is logged. user_ip = models.CharField(max_length=15) diff --git a/testapp/exam/urls.py b/testapp/exam/urls.py index e7284f2..ff1545a 100644 --- a/testapp/exam/urls.py +++ b/testapp/exam/urls.py @@ -3,13 +3,18 @@ from django.conf.urls.defaults import patterns, include, url urlpatterns = patterns('exam.views', url(r'^$', 'index'), url(r'^login/$', 'user_login'), + url(r'^quizzes/$','quizlist_user'), + url(r'^results/$','results_user'), url(r'^start/$', 'start'), - url(r'^quit/$', 'quit'), + url(r'^start/(?P\d+)/$','start'), + url(r'^quit/(?P\d+)/$', 'quit'), url(r'^intro/$','start'), - url(r'^complete/$', 'complete'), + url(r'^complete/$', 'complete'), + url(r'^complete/(?P\d+)/$', 'complete'), url(r'^register/$', 'user_register'), url(r'^(?P\d+)/$', 'question'), url(r'^(?P\d+)/check/$', 'check'), + url(r'^(?P\d+)/check/(?P\d+)/$', 'check'), url(r'^manage/$', 'prof_manage'), diff --git a/testapp/exam/views.py b/testapp/exam/views.py index 5e594b2..e485241 100644 --- a/testapp/exam/views.py +++ b/testapp/exam/views.py @@ -94,6 +94,38 @@ def user_register(request): {'form':form}, context_instance=RequestContext(request)) +def quizlist_user(request): + """Show All Quizzes that is available to logged-in user.""" + user=request.user + avail_quiz = list(QuestionPaper.objects.filter(quiz__active=True)) + user_answerpapers = AnswerPaper.objects.filter(user=user) + user_quiz = [] + + if user_answerpapers.count() == 0: + context = {'quizzes':avail_quiz} + return my_render_to_response("exam/quizzes_user.html",context) + + for paper in user_answerpapers: + for quiz in avail_quiz: + if paper.question_paper.id == quiz.id and paper.end_time != paper.start_time: + avail_quiz.remove(quiz) + + context = {'quizzes':avail_quiz,'user':user} + return my_render_to_response("exam/quizzes_user.html",context) + +def results_user(request): + """Show list of Results of Quizzes that is taken by logged-in user.""" + user = request.user + papers = AnswerPaper.objects.filter(user=user) + quiz_marks = [] + for paper in papers: + temp = [] + temp.append(paper.question_paper.quiz.description) + temp.append(paper.get_total_marks()) + quiz_marks.append(temp) + context = {'papers':quiz_marks} + return my_render_to_response("exam/results_user.html",context) + def edit_quiz(request): """Edit the list of quizzes seleted by the user for editing.""" @@ -128,7 +160,7 @@ def edit_quiz(request): def edit_question(request): """Edit the list of questions seleted by the user for editing.""" user = request.user - if not user.is_authenticated() or user.groups.filter(name='moderator').count() == 0 : + if not user.is_authenticated() or user.groups.filter(name='moderator').count() == 0: raise Http404('You are not allowed to view this page!') summary = request.POST.getlist('summary') @@ -581,23 +613,24 @@ def user_login(request): return my_render_to_response('exam/login.html', context, context_instance=RequestContext(request)) -def start(request): +def start(request,questionpaper_id=None): """Check the user cedentials and if any quiz is available, start the exam.""" - user = request.user + if questionpaper_id == None: + return my_redirect('/exam/quizzes/') try: # Right now the app is designed so there is only one active quiz # at a particular time. - questionpaper = QuestionPaper.objects.all()[0] + questionpaper = QuestionPaper.objects.get(id=questionpaper_id) except QuestionPaper.DoesNotExist: msg = 'Quiz not found, please contact your '\ 'instructor/administrator. Please login again thereafter.' return complete(request, reason=msg) try: - old_paper = AnswerPaper.objects.get(user=user, question_paper=questionpaper) + old_paper = AnswerPaper.objects.get(question_paper=questionpaper, user=user) q = old_paper.current_question() - return show_question(request, q) + return show_question(request, q,questionpaper_id) except AnswerPaper.DoesNotExist: ip = request.META['REMOTE_ADDR'] key = gen_key(10) @@ -610,7 +643,7 @@ def start(request): new_paper = AnswerPaper(user=user, user_ip=ip, question_paper=questionpaper, profile=profile) new_paper.start_time = datetime.datetime.now() - + new_paper.end_time = datetime.datetime.now() # Make user directory. user_dir = get_user_dir(user) @@ -623,12 +656,12 @@ def start(request): new_paper.save() # Show the user the intro page. - context = {'user': user} + context = {'user': user,'paper_id':questionpaper_id} ci = RequestContext(request) return my_render_to_response('exam/intro.html', context, context_instance=ci) -def question(request, q_id): +def question(request, q_id, questionpaper_id): """Check the credentials of the user and start the exam.""" user = request.user @@ -636,10 +669,10 @@ def question(request, q_id): return my_redirect('/exam/login/') q = get_object_or_404(Question, pk=q_id) try: - q_paper = QuestionPaper.objects.get(quiz__active=True) + q_paper = QuestionPaper.objects.get(id=questionpaper_id) paper = AnswerPaper.objects.get(user=request.user, question_paper=q_paper) except AnswerPaper.DoesNotExist: - return my_redirect('/exam/start') + return my_redirect('/exam/start/') if not paper.question_paper.quiz.active: return complete(request, reason='The quiz has been deactivated!') @@ -654,29 +687,29 @@ def question(request, q_id): return my_render_to_response('exam/question.html', context, context_instance=ci) -def show_question(request, q_id): +def show_question(request, q_id, questionpaper_id): """Show a question if possible.""" if len(q_id) == 0: msg = 'Congratulations! You have successfully completed the quiz.' return complete(request, msg) else: - return question(request, q_id) + return question(request, q_id, questionpaper_id) -def check(request, q_id): +def check(request, q_id, questionpaper_id=None): """Checks the answers of the user for particular question""" user = request.user if not user.is_authenticated(): return my_redirect('/exam/login/') question = get_object_or_404(Question, pk=q_id) - q_paper = QuestionPaper.objects.get(quiz__active=True) + q_paper = QuestionPaper.objects.get(id=questionpaper_id) paper = AnswerPaper.objects.get(user=request.user,question_paper = q_paper) answer = request.POST.get('answer') skip = request.POST.get('skip', None) if skip is not None: next_q = paper.skip() - return show_question(request, next_q) + return show_question(request, next_q,questionpaper_id) # Add the answer submitted, regardless of it being correct or not. new_answer = Answer(question=question, answer=answer, correct=False) @@ -723,17 +756,22 @@ def check(request, q_id): context_instance=ci) else: next_q = paper.completed_question(question.id) - return show_question(request, next_q) + return show_question(request, next_q,questionpaper_id) -def quit(request): +def quit(request, answerpaper_id=None): """Show the quit page when the user logs out.""" + context = { 'id':answerpaper_id} + return my_render_to_response('exam/quit.html',context,context_instance=RequestContext(request)) - return my_render_to_response('exam/quit.html',context_instance=RequestContext(request)) - -def complete(request,reason = None): +def complete(request,reason = None,answerpaper_id=None): """Show a page to inform user that the quiz has been compeleted.""" user = request.user + + if answerpaper_id == None: + logout(request) + context = {'message': "You are successfully Logged out."} + return my_render_to_response('exam/complete.html', context) no = False message = reason or 'The quiz has been completed. Thank you.' if user.groups.filter(name='moderator').count() > 0: @@ -742,9 +780,10 @@ def complete(request,reason = None): no = True if not no: # Logout the user and quit with the message given. - logout(request) - context = {'message': message} - return my_render_to_response('exam/complete.html', context) + answer_paper = AnswerPaper.objects.get(id=answerpaper_id) + answer_paper.endtime = datetime.datetime.now() + answer_paper.save() + return my_redirect('/exam/quizzes/') else: return my_redirect('/exam/') diff --git a/testapp/templates/exam/add_quiz.html b/testapp/templates/exam/add_quiz.html index c8e1ac3..2667c0c 100644 --- a/testapp/templates/exam/add_quiz.html +++ b/testapp/templates/exam/add_quiz.html @@ -13,7 +13,11 @@ @@ -28,7 +32,7 @@
- + {% endblock %} diff --git a/testapp/templates/exam/automatic_questionpaper.html b/testapp/templates/exam/automatic_questionpaper.html index b961711..b8f76b4 100644 --- a/testapp/templates/exam/automatic_questionpaper.html +++ b/testapp/templates/exam/automatic_questionpaper.html @@ -34,7 +34,7 @@ function load_data() {% endblock %} {% block manage %} -Automotic mode to design the Question Paper
+Automatic mode to design the Question Paper

{% csrf_token %} diff --git a/testapp/templates/exam/complete.html b/testapp/templates/exam/complete.html index a2e673b..1d5df3c 100644 --- a/testapp/templates/exam/complete.html +++ b/testapp/templates/exam/complete.html @@ -4,7 +4,7 @@ {% block pagetitle %}Online Test{% endblock %} {% block content %} - +{% csrf_token %}
Good bye!

{{message}}

You may now close the browser.

diff --git a/testapp/templates/exam/intro.html b/testapp/templates/exam/intro.html index afa596b..ec1888a 100644 --- a/testapp/templates/exam/intro.html +++ b/testapp/templates/exam/intro.html @@ -27,7 +27,7 @@

Summary +	Type +	Points +	Tags + {% for question in data.questions %} +
{{ question.summary }}	{{ question.type }}	{{ question.points }}	+ {% for tag in question.tags.all %} + {{ tag }} + {% endfor %} +

+	Summary +	Type +	Points +	Tags + {% for question in data.questions %} +
	{{ question.summary }}	{{ question.type }}	{{ question.points }}	+ {% for tag in question.tags.all %} + {{ tag }} + {% endfor %} +

We hope you enjoy taking this exam !!!
- + {% csrf_token %} diff --git a/testapp/templates/exam/question.html b/testapp/templates/exam/question.html index 87ed40d..584ab72 100644 --- a/testapp/templates/exam/question.html +++ b/testapp/templates/exam/question.html @@ -70,9 +70,9 @@

Hi {{user.first_name.title}} {{user.last_name.title}}

-
+ {% csrf_token %} - +

@@ -85,7 +85,7 @@ {% if error_message %}
ERROR:
{{ error_message }}
{% endif %}
-
+ {% csrf_token %} {% if question.type == "mcq" %} {% for option in question.options.strip.splitlines %} diff --git a/testapp/templates/exam/quit.html b/testapp/templates/exam/quit.html index 40a0a92..3f7630d 100644 --- a/testapp/templates/exam/quit.html +++ b/testapp/templates/exam/quit.html @@ -6,7 +6,8 @@
Your current answers are saved.

Are you sure you wish to quit the exam?
- +
Be sure, as you won't be able to restart this exam.
+ {% csrf_token %}
diff --git a/testapp/templates/exam/quizzes_user.html b/testapp/templates/exam/quizzes_user.html new file mode 100644 index 0000000..af2d98a --- /dev/null +++ b/testapp/templates/exam/quizzes_user.html @@ -0,0 +1,18 @@ +{% extends "user.html" %} + + +{% block subtitle %}Available Quizzes{% endblock %} + +{% block css %} + +{% endblock %} + +{% block manage %} + {% if not quizzes %} +
No active quizzes for you
+ {% endif %} + {% for paper in quizzes %} + {{ paper.quiz.description }}
+ {% endfor %} +{% endblock %} + diff --git a/testapp/templates/exam/results_user.html b/testapp/templates/exam/results_user.html new file mode 100644 index 0000000..75d168d --- /dev/null +++ b/testapp/templates/exam/results_user.html @@ -0,0 +1,23 @@ +{% extends "user.html" %} + + +{% block subtitle %}Results for {{ papers.user.first_name }}{% endblock %} + +{% block css %} + +{% endblock %} + +{% block manage %} +
+ {% csrf_token %} + + {% for paper in papers %} + {% for i in paper %} + {{ i }} + {% endfor %} +
+ {% endfor %} + +
+{% endblock %} + diff --git a/testapp/templates/user.html b/testapp/templates/user.html new file mode 100644 index 0000000..22a9fac --- /dev/null +++ b/testapp/templates/user.html @@ -0,0 +1,58 @@ + + + + + + {% block title %} + {% endblock %} + + + {% block meta %} + + + + {% endblock %} + + + {% block css %} + {% endblock %} + + {% block script %} + {% endblock %} + + + +
+
+
+
Online Test
+
+
Quizzes
+
Results
+
+
+
Log out
+
+
+
+
+
+
+
+
{% block subtitle %}Welcome {{ user.first_name.title }} {{user.last_name.title}} {% endblock %}

+
+
+
+ {% block manage %} + {% endblock %} +
+
+
+
+
© FOSSEE group, IIT Bombay
+
+
+ + + -- cgit From 5743fd26a6c844e45a306f9ad5aa589a95c34afe Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Thu, 31 May 2012 19:34:36 +0530 Subject: Minor UI Changes --- testapp/templates/exam/results_user.html | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/testapp/templates/exam/results_user.html b/testapp/templates/exam/results_user.html index 75d168d..bf847c0 100644 --- a/testapp/templates/exam/results_user.html +++ b/testapp/templates/exam/results_user.html @@ -1,7 +1,7 @@ {% extends "user.html" %} -{% block subtitle %}Results for {{ papers.user.first_name }}{% endblock %} +{% block subtitle %}Results{% endblock %} {% block css %} @@ -10,14 +10,17 @@ {% block manage %}
{% csrf_token %} - + + {% for i in paper %} - {{ i }} +
Quiz Description + Obtained Marks {% for paper in papers %} +
{{ i }} {% endfor %}
{% endfor %} - +
{% endblock %} -- cgit From 1712353f3646e24de7ec359bdbb9c9a3012b1597 Mon Sep 17 00:00:00 2001 From: Jay Parikh Date: Mon, 25 Jun 2012 17:28:28 +0530 Subject: implemented tabs & line numbers in textarea --- testapp/static/exam/css/question.css | 17 +++++ testapp/static/exam/js/question.js | 107 ++++++++++++++++++++++++++++++ testapp/templates/exam/question.html | 123 ++++++++++++++++++++++++++++++++++- testapp/test_server.py | 24 ++++++- 4 files changed, 269 insertions(+), 2 deletions(-) diff --git a/testapp/static/exam/css/question.css b/testapp/static/exam/css/question.css index a57b6dd..4bf5913 100644 --- a/testapp/static/exam/css/question.css +++ b/testapp/static/exam/css/question.css @@ -23,3 +23,20 @@ padding: 35px 20px 10px; margin: -20px -20px 20px; } +#codeTextarea{ + + } + .textAreaWithLines{ + font-family:courier; + border:1px solid #eee; + + } + .textAreaWithLines textarea,.textAreaWithLines div{ + border:0px; + line-height:120%; + font-size:12px; + } + .lineObj{ + color: grey; + } + diff --git a/testapp/static/exam/js/question.js b/testapp/static/exam/js/question.js index 554a948..7a05a09 100644 --- a/testapp/static/exam/js/question.js +++ b/testapp/static/exam/js/question.js @@ -35,3 +35,110 @@ document.forms["code"].submit(); } } + +function setSelectionRange(input, selectionStart, selectionEnd) { + if (input.setSelectionRange) { + input.focus(); + input.setSelectionRange(selectionStart, selectionEnd); + } + else if (input.createTextRange) { + var range = input.createTextRange(); + range.collapse(true); + range.moveEnd('character', selectionEnd); + range.moveStart('character', selectionStart); + range.select(); + } +} + +function replaceSelection (input, replaceString) { + if (input.setSelectionRange) { + var selectionStart = input.selectionStart; + var selectionEnd = input.selectionEnd; + input.value = input.value.substring(0, selectionStart)+ replaceString + input.value.substring(selectionEnd); + + if (selectionStart != selectionEnd){ + setSelectionRange(input, selectionStart, selectionStart + replaceString.length); + }else{ + setSelectionRange(input, selectionStart + replaceString.length, selectionStart + replaceString.length); + } + + }else if (document.selection) { + var range = document.selection.createRange(); + + if (range.parentElement() == input) { + var isCollapsed = range.text == ''; + range.text = replaceString; + + if (!isCollapsed) { + range.moveStart('character', -replaceString.length); + range.select(); + } + } + } +} + + +// We are going to catch the TAB key so that we can use it, Hooray! +function catchTab(item,e){ + if(navigator.userAgent.match("Gecko")){ + c=e.which; + }else{ + c=e.keyCode; + } + if(c==9){ + replaceSelection(item,String.fromCharCode(9)); + setTimeout("document.getElementById('"+item.id+"').focus();",0); + return false; + } + +} + +var lineObjOffsetTop = 2; + + function createTextAreaWithLines(id) + { + var el = document.createElement('DIV'); + var ta = document.getElementById(id); + ta.parentNode.insertBefore(el,ta); + el.appendChild(ta); + + el.className='textAreaWithLines'; + el.style.width = (ta.offsetWidth + 30) + 'px'; + ta.style.position = 'absolute'; + ta.style.left = '30px'; + el.style.height = (ta.offsetHeight + 2) + 'px'; + el.style.overflow='hidden'; + el.style.position = 'relative'; + el.style.width = (ta.offsetWidth + 30) + 'px'; + var lineObj = document.createElement('DIV'); + lineObj.style.position = 'absolute'; + lineObj.style.top = lineObjOffsetTop + 'px'; + lineObj.style.left = '0px'; + lineObj.style.width = '27px'; + el.insertBefore(lineObj,ta); + lineObj.style.textAlign = 'right'; + lineObj.className='lineObj'; + var string = ''; + for(var no=1;no<200;no++){ + if(string.length>0)string = string + '
'; + string = string + no; + } + + //ta.onkeydown = function() { positionLineObj(lineObj,ta); }; + ta.onmousedown = function() { positionLineObj(lineObj,ta); }; + ta.onscroll = function() { positionLineObj(lineObj,ta); }; + ta.onblur = function() { positionLineObj(lineObj,ta); }; + ta.onfocus = function() { positionLineObj(lineObj,ta); }; + ta.onmouseover = function() { positionLineObj(lineObj,ta); }; + lineObj.innerHTML = string; + + } + + function positionLineObj(obj,ta) + { + obj.style.top = (ta.scrollTop * -1 + lineObjOffsetTop) + 'px'; + + + } + + diff --git a/testapp/templates/exam/question.html b/testapp/templates/exam/question.html index 584ab72..b2f5816 100644 --- a/testapp/templates/exam/question.html +++ b/testapp/templates/exam/question.html @@ -6,9 +6,123 @@ {% block css %} + {% endblock %} {% block script %} + + + + + {% endblock script %} + {% block onload %} onload="update_time()" {% endblock onload %} {% block pagetitle %} @@ -92,7 +207,13 @@ {{option}}
{% endfor %} {% else %} - {% if last_attempt %}{{last_attempt.strip}}{% else %}{% if question.type == "bash" %} #!/bin/bash{% else %}# Enter your answer here.{% endif %}{% endif %} + + {% if last_attempt %}{{last_attempt.strip}}{% else %}{% if question.type == "bash" %} #!/bin/bash{% else %}# Enter your answer here.{% endif %}{% endif %} +
+ + {% endif %} {% if question.type == "mcq" %} diff --git a/testapp/test_server.py b/testapp/test_server.py index be9f876..e81daf2 100644 --- a/testapp/test_server.py +++ b/testapp/test_server.py @@ -35,6 +35,28 @@ def test_python(): language="python") check_result(result, 'nameerror') +def test_c(): + """Test if server runs Python code as expected.""" + src = 'while True: pass' + result = code_server.run_code(src, '', '/tmp', language="c") + check_result(result, 'more than ') + + src = 'x = 1' + result = code_server.run_code(src, 'assert x == 1', '/tmp', + language="c") + check_result(result, 'correct answer') + + result = code_server.run_code(src, 'assert x == 0', '/tmp', + language="c") + check_result(result, 'assertionerror') + + src = 'C lang. Code' + result = code_server.run_code(src, 'assert x == 0', '/tmp', + language="c") + check_result(result, 'nameerror') + + + def test_bash(): """Test if server runs Bash code as expected.""" src = """ @@ -80,4 +102,4 @@ def test_bash(): if __name__ == '__main__': test_python() test_bash() - + test_c() -- cgit From 7f0d00746a9ea009179c2e3879fa1bf8354a5853 Mon Sep 17 00:00:00 2001 From: Jay Parikh Date: Mon, 25 Jun 2012 17:39:30 +0530 Subject: minor change (quit exam) --- testapp/templates/exam/quit.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testapp/templates/exam/quit.html b/testapp/templates/exam/quit.html index 3f7630d..fee11ed 100644 --- a/testapp/templates/exam/quit.html +++ b/testapp/templates/exam/quit.html @@ -9,6 +9,6 @@
Be sure, as you won't be able to restart this exam.

{% csrf_token %} - +
{% endblock content %} -- cgit From 12587ff8b3d9ad1cf94c9b44fa9e0e04f08afeff Mon Sep 17 00:00:00 2001 From: jayparikh111 Date: Fri, 3 Aug 2012 17:27:38 +0530 Subject: 404 page settings --- testapp/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testapp/settings.py b/testapp/settings.py index 39331ce..b8ca8a3 100644 --- a/testapp/settings.py +++ b/testapp/settings.py @@ -2,7 +2,7 @@ from os.path import dirname, join, basename, abspath -DEBUG = True +DEBUG = False TEMPLATE_DEBUG = DEBUG # The ports the code server should run on. This will run one separate -- cgit From cad1366b66a4079a22eb3a6f0b41c2705a6e0a0b Mon Sep 17 00:00:00 2001 From: jayparikh111 Date: Tue, 30 Oct 2012 12:08:43 +0530 Subject: a minor change to get back the original UI --- testapp/settings.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/testapp/settings.py b/testapp/settings.py index b8ca8a3..204ed2b 100644 --- a/testapp/settings.py +++ b/testapp/settings.py @@ -2,7 +2,7 @@ from os.path import dirname, join, basename, abspath -DEBUG = False +DEBUG = True TEMPLATE_DEBUG = DEBUG # The ports the code server should run on. This will run one separate @@ -192,6 +192,3 @@ LOGGING = { } AUTH_PROFILE_MODULE = 'exam.Profile' - -INTERNAL_IPS = ('127.0.0.1',) - -- cgit From 56bd985701bee1e4c9ed8a694c5b2ff1258e2aad Mon Sep 17 00:00:00 2001 From: jayparikh111 Date: Thu, 1 Nov 2012 13:43:21 +0530 Subject: Removed Global variables for Quiz & Questions --- testapp/exam/views.py | 257 +++++++++++++----------------- testapp/static/exam/js/show_quiz.js | 22 +-- testapp/templates/exam/edit_question.html | 5 + testapp/templates/exam/edit_quiz.html | 3 + 4 files changed, 133 insertions(+), 154 deletions(-) diff --git a/testapp/exam/views.py b/testapp/exam/views.py index e485241..3c6f0e5 100644 --- a/testapp/exam/views.py +++ b/testapp/exam/views.py @@ -24,20 +24,6 @@ OUTPUT_DIR = abspath(join(dirname(__file__), pardir, 'output')) set1 = set() set2 = set() -def my_redirect(url): - """An overridden redirect to deal with URL_ROOT-ing. See settings.py - for details.""" - return redirect(URL_ROOT + url) - -def my_render_to_response(template, context=None, **kwargs): - """Overridden render_to_response. - """ - if context is None: - context = {'URL_ROOT': URL_ROOT} - else: - context['URL_ROOT'] = URL_ROOT - return render_to_response(template, context, **kwargs) - def gen_key(no_of_chars): """Generate a random key of the number of characters.""" allowed_chars = string.digits+string.uppercase @@ -61,10 +47,10 @@ def index(request): user = request.user if user.is_authenticated(): if user.groups.filter(name='moderator').count() > 0: - return my_redirect('/exam/manage/') - return my_redirect("/exam/start/") + return redirect('/exam/manage/') + return redirect("/exam/start/") - return my_redirect("/exam/login/") + return redirect("/exam/login/") def user_register(request): """ Register a new user. @@ -72,7 +58,7 @@ def user_register(request): user = request.user if user.is_authenticated(): - return my_redirect("/exam/start/") + return redirect("/exam/start/") if request.method == "POST": form = UserRegisterForm(request.POST) @@ -82,15 +68,15 @@ def user_register(request): new_user = authenticate(username = u_name, password = pwd) login(request, new_user) - return my_redirect("/exam/start/") + return redirect("/exam/start/") else: - return my_render_to_response('exam/register.html', + return render_to_response('exam/register.html', {'form':form}, context_instance=RequestContext(request)) else: form = UserRegisterForm() - return my_render_to_response('exam/register.html', + return render_to_response('exam/register.html', {'form':form}, context_instance=RequestContext(request)) @@ -103,7 +89,7 @@ def quizlist_user(request): if user_answerpapers.count() == 0: context = {'quizzes':avail_quiz} - return my_render_to_response("exam/quizzes_user.html",context) + return render_to_response("exam/quizzes_user.html",context) for paper in user_answerpapers: for quiz in avail_quiz: @@ -111,7 +97,7 @@ def quizlist_user(request): avail_quiz.remove(quiz) context = {'quizzes':avail_quiz,'user':user} - return my_render_to_response("exam/quizzes_user.html",context) + return render_to_response("exam/quizzes_user.html",context) def results_user(request): """Show list of Results of Quizzes that is taken by logged-in user.""" @@ -124,7 +110,7 @@ def results_user(request): temp.append(paper.get_total_marks()) quiz_marks.append(temp) context = {'papers':quiz_marks} - return my_render_to_response("exam/results_user.html",context) + return render_to_response("exam/results_user.html",context) def edit_quiz(request): """Edit the list of quizzes seleted by the user for editing.""" @@ -132,14 +118,14 @@ def edit_quiz(request): user = request.user if not user.is_authenticated() or user.groups.filter(name='moderator').count() == 0: raise Http404('You are not allowed to view this page!') - + quizzes = request.POST.getlist('quizzes') start_date = request.POST.getlist('start_date') duration = request.POST.getlist('duration') active = request.POST.getlist('active') description = request.POST.getlist('description') j = 0 - for i in quizlist: + for i in quizzes: quiz = Quiz.objects.get(id=i) quiz.start_date = start_date[j] quiz.duration = duration[j] @@ -155,7 +141,7 @@ def edit_quiz(request): tag = tags_split[i].strip() quiz.tags.add(tag) j += 1 - return my_redirect("/exam/manage/showquiz/") + return redirect("/exam/manage/showquiz/") def edit_question(request): """Edit the list of questions seleted by the user for editing.""" @@ -163,6 +149,7 @@ def edit_question(request): if not user.is_authenticated() or user.groups.filter(name='moderator').count() == 0: raise Http404('You are not allowed to view this page!') + questions = request.POST.getlist('questions') summary = request.POST.getlist('summary') description = request.POST.getlist('description') points = request.POST.getlist('points') @@ -172,7 +159,7 @@ def edit_question(request): active = request.POST.getlist('active') tags = request.POST.getlist('tags') j = 0 - for id_list in editquestionlist: + for id_list in questions: question = Question.objects.get(id=id_list) question.summary = summary[j] question.description = description[j] @@ -190,7 +177,7 @@ def edit_question(request): tag = tags_split[i].strip() question.tags.add(tag) j += 1 - return my_redirect("/exam/manage/questions") + return redirect("/exam/manage/questions") def add_question(request,question_id=None): @@ -209,7 +196,7 @@ def add_question(request,question_id=None): for i in range(0,len(tags)-1): tag = tags[i].strip() question.tags.add(tag) - return my_redirect("/exam/manage/questions") + return redirect("/exam/manage/questions") else: d = Question.objects.get(id=question_id) @@ -228,16 +215,16 @@ def add_question(request,question_id=None): for i in range(0,len(tags)-1): tag = tags[i].strip() question.tags.add(tag) - return my_redirect("/exam/manage/questions") + return redirect("/exam/manage/questions") else: - return my_render_to_response('exam/add_question.html', + return render_to_response('exam/add_question.html', {'form':form}, context_instance=RequestContext(request)) else: if question_id == None: form = QuestionForm() - return my_render_to_response('exam/add_question.html', + return render_to_response('exam/add_question.html', {'form':form}, context_instance=RequestContext(request)) else: @@ -260,7 +247,7 @@ def add_question(request,question_id=None): if (initial_tags == ","): initial_tags = "" form.initial['tags']=initial_tags - return my_render_to_response('exam/add_question.html',{'form':form},context_instance=RequestContext(request)) + return render_to_response('exam/add_question.html',{'form':form},context_instance=RequestContext(request)) def add_quiz(request,quiz_id=None): @@ -280,7 +267,7 @@ def add_quiz(request,quiz_id=None): for tag in tags: tag = tag.strip() quiz.tags.add(tag) - return my_redirect("/exam/manage/designquestionpaper") + return redirect("/exam/manage/designquestionpaper") else: d = Quiz.objects.get(id=quiz_id) d.start_date = form['start_date'].data @@ -295,16 +282,16 @@ def add_quiz(request,quiz_id=None): for i in range(0,len(tags)-1): tag = tags[i].strip() quiz.tags.add(tag) - return my_redirect("/exam/manage/showquiz") + return redirect("/exam/manage/showquiz") else: - return my_render_to_response('exam/add_quiz.html', + return render_to_response('exam/add_quiz.html', {'form':form}, context_instance=RequestContext(request)) else: if quiz_id == None: form = QuizForm() - return my_render_to_response('exam/add_quiz.html', + return render_to_response('exam/add_quiz.html', {'form':form}, context_instance=RequestContext(request)) else: @@ -323,14 +310,14 @@ def add_quiz(request,quiz_id=None): if (initial_tags == ","): initial_tags = "" form.initial['tags']=initial_tags - return my_render_to_response('exam/add_quiz.html',{'form':form},context_instance=RequestContext(request)) + return render_to_response('exam/add_quiz.html',{'form':form},context_instance=RequestContext(request)) def design_questionpaper(request,questionpaper_id=None): user=request.user if not user.is_authenticated() or user.groups.filter(name='moderator').count() == 0 : raise Http404('You are not allowed to view this page!') - return my_render_to_response('exam/add_questionpaper.html',{},context_instance=RequestContext(request)) + return render_to_response('exam/add_questionpaper.html',{},context_instance=RequestContext(request)) def show_all_questionpapers(request,questionpaper_id=None): @@ -339,7 +326,7 @@ def show_all_questionpapers(request,questionpaper_id=None): raise Http404('You are not allowed to view this page!') if request.method=="POST" and request.POST.get('add') == "add": - return my_redirect("/exam/manage/designquestionpaper/" + questionpaper_id) + return redirect("/exam/manage/designquestionpaper/" + questionpaper_id) if request.method=="POST" and request.POST.get('delete') == "delete": data = request.POST.getlist('papers') @@ -347,16 +334,16 @@ def show_all_questionpapers(request,questionpaper_id=None): q_paper = QuestionPaper.objects.get(id=i).delete() question_paper= QuestionPaper.objects.all() context = {'papers': question_paper, } - return my_render_to_response('exam/showquestionpapers.html', context, + return render_to_response('exam/showquestionpapers.html', context, context_instance=RequestContext(request)) qu_papers = QuestionPaper.objects.all() context = {'papers':qu_papers} - return my_render_to_response('exam/showquestionpapers.html',context,context_instance=RequestContext(request)) + return render_to_response('exam/showquestionpapers.html',context,context_instance=RequestContext(request)) if questionpaper_id == None: qu_papers = QuestionPaper.objects.all() context = {'papers':qu_papers} - return my_render_to_response('exam/showquestionpapers.html',context,context_instance=RequestContext(request)) + return render_to_response('exam/showquestionpapers.html',context,context_instance=RequestContext(request)) else: qu_papers = QuestionPaper.objects.get(id=questionpaper_id) quiz = qu_papers.quiz @@ -365,7 +352,7 @@ def show_all_questionpapers(request,questionpaper_id=None): for i in questions: q.append(i) context = {'papers':{'quiz':quiz,'questions':q}} - return my_render_to_response('exam/editquestionpaper.html',context,context_instance=RequestContext(request)) + return render_to_response('exam/editquestionpaper.html',context,context_instance=RequestContext(request)) def automatic_questionpaper(request,questionpaper_id=None): @@ -386,7 +373,7 @@ def automatic_questionpaper(request,questionpaper_id=None): for i in set2: q = Question.objects.get(summary=i) quest_paper.questions.add(q) - return my_redirect('/exam/manage/showquiz') + return redirect('/exam/manage/showquiz') else: set1 = set() set2 = set() @@ -421,11 +408,11 @@ def automatic_questionpaper(request,questionpaper_id=None): msg = 'The given Criteria does not satisfy the number of Questions...' tags = Tag.objects.all() context = {'data':{'questions':set2,'tags':tags,'msg':msg}} - return my_render_to_response('exam/automatic_questionpaper.html',context,context_instance=RequestContext(request)) + return render_to_response('exam/automatic_questionpaper.html',context,context_instance=RequestContext(request)) else: tags = Tag.objects.all() context = {'data':{'tags':tags}} - return my_render_to_response('exam/automatic_questionpaper.html',context,context_instance=RequestContext(request)) + return render_to_response('exam/automatic_questionpaper.html',context,context_instance=RequestContext(request)) else: if request.method=="POST": @@ -435,7 +422,7 @@ def automatic_questionpaper(request,questionpaper_id=None): print str(i.id) + " " + i.summary q = Question.objects.get(summary=i) quest_paper.questions.add(q) - return my_redirect('/exam/manage/showquiz') + return redirect('/exam/manage/showquiz') else: set1 = set() set2 = set() @@ -470,11 +457,11 @@ def automatic_questionpaper(request,questionpaper_id=None): msg = 'The given Criteria does not satisfy the number of Questions...' tags = Tag.objects.all() context = {'data':{'questions':set2,'tags':tags,'msg':msg}} - return my_render_to_response('exam/automatic_questionpaper.html',context,context_instance=RequestContext(request)) + return render_to_response('exam/automatic_questionpaper.html',context,context_instance=RequestContext(request)) else: tags = Tag.objects.all() context = {'data':{'tags':tags}} - return my_render_to_response('exam/automatic_questionpaper.html',context,context_instance=RequestContext(request)) + return render_to_response('exam/automatic_questionpaper.html',context,context_instance=RequestContext(request)) def manual_questionpaper(request,questionpaper_id=None): user=request.user @@ -494,7 +481,7 @@ def manual_questionpaper(request,questionpaper_id=None): for i in questions: q = Question.objects.get(id=i) quest_paper.questions.add(q) - return my_redirect('/exam/manage/showquiz') + return redirect('/exam/manage/showquiz') else: set1 = set() set2 = set() @@ -524,11 +511,11 @@ def manual_questionpaper(request,questionpaper_id=None): msg = 'No matching Question found...' tags = Tag.objects.all() context = {'data':{'questions':set2,'tags':tags,'msg':msg}} - return my_render_to_response('exam/manual_questionpaper.html',context,context_instance=RequestContext(request)) + return render_to_response('exam/manual_questionpaper.html',context,context_instance=RequestContext(request)) else: tags = Tag.objects.all() context = {'data':{'tags':tags}} - return my_render_to_response('exam/manual_questionpaper.html',context,context_instance=RequestContext(request)) + return render_to_response('exam/manual_questionpaper.html',context,context_instance=RequestContext(request)) else: if request.method=="POST": @@ -538,7 +525,7 @@ def manual_questionpaper(request,questionpaper_id=None): for i in questions: q = Question.objects.get(id=i) quest_paper.questions.add(q) - return my_redirect('/exam/manage/showquiz') + return redirect('/exam/manage/showquiz') else: set1 = set() set2 = set() @@ -568,11 +555,11 @@ def manual_questionpaper(request,questionpaper_id=None): msg = 'No matching Question found...' tags = Tag.objects.all() context = {'data':{'questions':set2,'tags':tags,'msg':msg}} - return my_render_to_response('exam/manual_questionpaper.html',context,context_instance=RequestContext(request)) + return render_to_response('exam/manual_questionpaper.html',context,context_instance=RequestContext(request)) else: tags = Tag.objects.all() context = {'data':{'tags':tags}} - return my_render_to_response('exam/manual_questionpaper.html',context,context_instance=RequestContext(request)) + return render_to_response('exam/manual_questionpaper.html',context,context_instance=RequestContext(request)) @@ -584,7 +571,7 @@ def prof_manage(request): if user.is_authenticated() and user.groups.filter(name='moderator').count() > 0: context = {'user':user} return render_to_response('manage.html',context) - return my_redirect('/exam/login/') + return redirect('/exam/login/') def user_login(request): """Take the credentials of the user and log the user in.""" @@ -592,8 +579,8 @@ def user_login(request): user = request.user if user.is_authenticated(): if user.groups.filter(name='moderator').count() > 0 : - return my_redirect('/exam/manage/') - return my_redirect("/exam/intro/") + return redirect('/exam/manage/') + return redirect("/exam/intro/") if request.method == "POST": form = UserLoginForm(request.POST) @@ -601,23 +588,23 @@ def user_login(request): user = form.cleaned_data login(request, user) if user.groups.filter(name='moderator').count() > 0 : - return my_redirect('/exam/manage/') - return my_redirect('/exam/login/') + return redirect('/exam/manage/') + return redirect('/exam/login/') else: context = {"form": form} - return my_render_to_response('exam/login.html', context, + return render_to_response('exam/login.html', context, context_instance=RequestContext(request)) else: form = UserLoginForm() context = {"form": form} - return my_render_to_response('exam/login.html', context, + return render_to_response('exam/login.html', context, context_instance=RequestContext(request)) def start(request,questionpaper_id=None): """Check the user cedentials and if any quiz is available, start the exam.""" user = request.user if questionpaper_id == None: - return my_redirect('/exam/quizzes/') + return redirect('/exam/quizzes/') try: # Right now the app is designed so there is only one active quiz # at a particular time. @@ -658,7 +645,7 @@ def start(request,questionpaper_id=None): # Show the user the intro page. context = {'user': user,'paper_id':questionpaper_id} ci = RequestContext(request) - return my_render_to_response('exam/intro.html', context, + return render_to_response('exam/intro.html', context, context_instance=ci) def question(request, q_id, questionpaper_id): @@ -666,13 +653,13 @@ def question(request, q_id, questionpaper_id): user = request.user if not user.is_authenticated(): - return my_redirect('/exam/login/') + return redirect('/exam/login/') q = get_object_or_404(Question, pk=q_id) try: q_paper = QuestionPaper.objects.get(id=questionpaper_id) paper = AnswerPaper.objects.get(user=request.user, question_paper=q_paper) except AnswerPaper.DoesNotExist: - return my_redirect('/exam/start/') + return redirect('/exam/start/') if not paper.question_paper.quiz.active: return complete(request, reason='The quiz has been deactivated!') @@ -684,7 +671,7 @@ def question(request, q_id, questionpaper_id): 'quiz_name': quiz_name, 'time_left': time_left} ci = RequestContext(request) - return my_render_to_response('exam/question.html', context, + return render_to_response('exam/question.html', context, context_instance=ci) def show_question(request, q_id, questionpaper_id): @@ -700,7 +687,7 @@ def check(request, q_id, questionpaper_id=None): user = request.user if not user.is_authenticated(): - return my_redirect('/exam/login/') + return redirect('/exam/login/') question = get_object_or_404(Question, pk=q_id) q_paper = QuestionPaper.objects.get(id=questionpaper_id) paper = AnswerPaper.objects.get(user=request.user,question_paper = q_paper) @@ -752,7 +739,7 @@ def check(request, q_id, questionpaper_id=None): 'time_left': time_left} ci = RequestContext(request) - return my_render_to_response('exam/question.html', context, + return render_to_response('exam/question.html', context, context_instance=ci) else: next_q = paper.completed_question(question.id) @@ -761,7 +748,7 @@ def check(request, q_id, questionpaper_id=None): def quit(request, answerpaper_id=None): """Show the quit page when the user logs out.""" context = { 'id':answerpaper_id} - return my_render_to_response('exam/quit.html',context,context_instance=RequestContext(request)) + return render_to_response('exam/quit.html',context,context_instance=RequestContext(request)) def complete(request,reason = None,answerpaper_id=None): """Show a page to inform user that the quiz has been compeleted.""" @@ -771,7 +758,7 @@ def complete(request,reason = None,answerpaper_id=None): if answerpaper_id == None: logout(request) context = {'message': "You are successfully Logged out."} - return my_render_to_response('exam/complete.html', context) + return render_to_response('exam/complete.html', context) no = False message = reason or 'The quiz has been completed. Thank you.' if user.groups.filter(name='moderator').count() > 0: @@ -783,9 +770,9 @@ def complete(request,reason = None,answerpaper_id=None): answer_paper = AnswerPaper.objects.get(id=answerpaper_id) answer_paper.endtime = datetime.datetime.now() answer_paper.save() - return my_redirect('/exam/quizzes/') + return redirect('/exam/quizzes/') else: - return my_redirect('/exam/') + return redirect('/exam/') def monitor(request, quiz_id=None): """Monitor the progress of the papers taken so far.""" @@ -799,7 +786,7 @@ def monitor(request, quiz_id=None): context = {'papers': [], 'quiz': None, 'quizzes':q_paper} - return my_render_to_response('exam/monitor.html', context, + return render_to_response('exam/monitor.html', context, context_instance=RequestContext(request)) # quiz_id is not None. try: @@ -812,7 +799,7 @@ def monitor(request, quiz_id=None): total=Sum('answers__marks')).order_by('-total') context = {'papers': papers, 'quiz': quiz, 'quizzes': None} - return my_render_to_response('exam/monitor.html', context, + return render_to_response('exam/monitor.html', context, context_instance=RequestContext(request)) def get_user_data(username): @@ -842,7 +829,7 @@ def show_all_users(request): user = User.objects.filter(username__contains="") questionpaper = AnswerPaper.objects.all() context = { 'question': questionpaper } - return my_render_to_response('exam/showusers.html',context,context_instance=RequestContext(request)) + return render_to_response('exam/showusers.html',context,context_instance=RequestContext(request)) def show_all_quiz(request): """Generates a list of all the quizzes that are currently in the database.""" @@ -859,7 +846,7 @@ def show_all_quiz(request): context = {'papers': [], 'quiz': None, 'quizzes':quizzes} - return my_render_to_response('exam/show_quiz.html', context, + return render_to_response('exam/show_quiz.html', context, context_instance=RequestContext(request)) else: for i in data: @@ -868,40 +855,29 @@ def show_all_quiz(request): context = {'papers': [], 'quiz': None, 'quizzes':quizzes} - return my_render_to_response('exam/show_quiz.html', context, + return render_to_response('exam/show_quiz.html', context, context_instance=RequestContext(request)) elif request.method == 'POST' and request.POST.get('edit')=='edit': data = request.POST.getlist('quiz') - global quizlist - quizlist = data - if data == None: - quiz = Quiz.objects.all() - context = {'papers': [], - 'quiz': None, - 'quizzes':quiz} - return my_render_to_response('exam/showquiz.html', context, - context_instance=RequestContext(request)) - else: - forms = [] - for j in data: - d = Quiz.objects.get(id=j) - form = QuizForm() - form.initial['start_date']= d.start_date - form.initial['duration'] = d.duration - form.initial['active']= d.active - form.initial['description'] = d.description - form_tags = d.tags.all() - form_tags_split = form_tags.values('name') + forms = [] + for j in data: + d = Quiz.objects.get(id=j) + form = QuizForm() + form.initial['start_date']= d.start_date + form.initial['duration'] = d.duration + form.initial['active']= d.active + form.initial['description'] = d.description + form_tags = d.tags.all() + form_tags_split = form_tags.values('name') + initial_tags = "" + for tag in form_tags_split: + initial_tags = initial_tags + str(tag['name']).strip() + "," + if (initial_tags == ","): initial_tags = "" - for tag in form_tags_split: - initial_tags = initial_tags + str(tag['name']).strip() + "," - if (initial_tags == ","): - initial_tags = "" - form.initial['tags']=initial_tags - forms.append(form) - return my_render_to_response('exam/edit_quiz.html', - {'forms':forms}, + form.initial['tags']=initial_tags + forms.append(form) + return render_to_response('exam/edit_quiz.html',{'forms':forms,'data':data}, context_instance=RequestContext(request)) else: @@ -909,7 +885,7 @@ def show_all_quiz(request): context = {'papers': [], 'quiz': None, 'quizzes':quizzes} - return my_render_to_response('exam/show_quiz.html', context, + return render_to_response('exam/show_quiz.html', context, context_instance=RequestContext(request)) @@ -927,7 +903,7 @@ def show_all_questions(request): context = {'papers': [], 'question': None, 'questions':questions} - return my_render_to_response('exam/showquestions.html', context, + return render_to_response('exam/showquestions.html', context, context_instance=RequestContext(request)) else: for i in data: @@ -936,49 +912,40 @@ def show_all_questions(request): context = {'papers': [], 'question': None, 'questions':questions} - return my_render_to_response('exam/showquestions.html', context, + return render_to_response('exam/showquestions.html', context, context_instance=RequestContext(request)) elif request.method == 'POST' and request.POST.get('edit')=='edit': data = request.POST.getlist('question') - global editquestionlist - editquestionlist = data - if data == None: - questions = Question.objects.all() - context = {'papers': [], - 'question': None, - 'questions':questions} - return my_render_to_response('exam/showquestions.html', context, - context_instance=RequestContext(request)) - else: - forms = [] - for j in data: - d = Question.objects.get(id=j) - form = QuestionForm() - form.initial['summary']= d.summary - form.initial['description'] = d.description - form.initial['points']= d.points - form.initial['test'] = d.test - form.initial['options'] = d.options - form.initial['type'] = d.type - form.initial['active'] = d.active - form_tags = d.tags.all() - form_tags_split = form_tags.values('name') + + forms = [] + for j in data: + d = Question.objects.get(id=j) + form = QuestionForm() + form.initial['summary']= d.summary + form.initial['description'] = d.description + form.initial['points']= d.points + form.initial['test'] = d.test + form.initial['options'] = d.options + form.initial['type'] = d.type + form.initial['active'] = d.active + form_tags = d.tags.all() + form_tags_split = form_tags.values('name') + initial_tags = "" + for tag in form_tags_split: + initial_tags = initial_tags + str(tag['name']).strip() + "," + if (initial_tags == ","): initial_tags = "" - for tag in form_tags_split: - initial_tags = initial_tags + str(tag['name']).strip() + "," - if (initial_tags == ","): - initial_tags = "" - form.initial['tags']=initial_tags - forms.append(form) - return my_render_to_response('exam/edit_question.html',{'forms':forms},context_instance=RequestContext(request)) + form.initial['tags']=initial_tags + forms.append(form) + return render_to_response('exam/edit_question.html',{'forms':forms,'data':data},context_instance=RequestContext(request)) else: questions = Question.objects.all() context = {'papers': [], 'question': None, 'questions':questions} - return my_render_to_response('exam/showquestions.html', context, + return render_to_response('exam/showquestions.html', context, context_instance=RequestContext(request)) def user_data(request, username): @@ -991,7 +958,7 @@ def user_data(request, username): data = get_user_data(username) context = {'data': data} - return my_render_to_response('exam/user_data.html', context, + return render_to_response('exam/user_data.html', context, context_instance=RequestContext(request)) def grade_user(request, username): @@ -1015,9 +982,9 @@ def grade_user(request, username): paper.save() context = {'data': data} - return my_render_to_response('exam/user_data.html', context, + return render_to_response('exam/user_data.html', context, context_instance=RequestContext(request)) else: context = {'data': data} - return my_render_to_response('exam/grade_user.html', context, + return render_to_response('exam/grade_user.html', context, context_instance=RequestContext(request)) diff --git a/testapp/static/exam/js/show_quiz.js b/testapp/static/exam/js/show_quiz.js index 55813c9..2e6e2de 100644 --- a/testapp/static/exam/js/show_quiz.js +++ b/testapp/static/exam/js/show_quiz.js @@ -1,12 +1,13 @@ function confirm_delete(frm) { var n=0; - for (var i =0;i {% csrf_token %}
Click on the Question links to edit the question.
+ {% for form in forms %} @@ -42,6 +43,10 @@ {% endfor %}
+{% for i in data %} + +{% endfor %} + diff --git a/testapp/templates/exam/edit_quiz.html b/testapp/templates/exam/edit_quiz.html index 8e4917d..0ea4aae 100644 --- a/testapp/templates/exam/edit_quiz.html +++ b/testapp/templates/exam/edit_quiz.html @@ -31,6 +31,9 @@ {% endfor %} +{% for i in data %} + +{% endfor %} -- cgit From a89925bb656c6223c1e2f7f89f95eb66d7c96c50 Mon Sep 17 00:00:00 2001 From: jayparikh111 Date: Thu, 1 Nov 2012 13:54:35 +0530 Subject: corrected a minor mistake in readme --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 72463c3..3472dfc 100644 --- a/README.rst +++ b/README.rst @@ -152,7 +152,7 @@ To install this app follow the steps below: #. run:: - ./bin/buildout -c production.cfg + ./bin/buildout -c buildout.cfg #. run:: -- cgit From 952f212c235a94cb0c750950300f6624ae87c4f0 Mon Sep 17 00:00:00 2001 From: jayparikh111 Date: Fri, 2 Nov 2012 12:22:54 +0530 Subject: minor changes in production file --- production.cfg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/production.cfg b/production.cfg index 9ea9f7b..0739e07 100644 --- a/production.cfg +++ b/production.cfg @@ -3,8 +3,9 @@ parts = django eggs = South - MySQL-python + psycopg2 +versions = versions [versions] django = 1.3 -- cgit From fa9f7401b3db215c61b7f382045e6542b1317bd9 Mon Sep 17 00:00:00 2001 From: jayparikh111 Date: Fri, 2 Nov 2012 15:13:03 +0530 Subject: production.py changed --- testapp/production.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testapp/production.py b/testapp/production.py index 2710bdb..636785f 100644 --- a/testapp/production.py +++ b/testapp/production.py @@ -1,4 +1,4 @@ -from project.settings import * +from testapp.settings import * DEBUG=False TEMPLATE_DEBUG=DEBUG @@ -7,4 +7,4 @@ DATABASE_ENGINE = 'django.db.backends.mysql' DATABASE_NAME = 'online_test' DATABASE_USER = 'online_test_user' # Imports DATABASE_PASSWORD from testapp/local.py that is not part of git repo -from testapp.local import DATABASE_PASSWORD \ No newline at end of file +from testapp.local import DATABASE_PASSWORD -- cgit From 982bb9d0fbccb3f591f227093bdbc87412c732a7 Mon Sep 17 00:00:00 2001 From: jayparikh111 Date: Fri, 2 Nov 2012 15:16:35 +0530 Subject: minor changes --- testapp/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testapp/settings.py b/testapp/settings.py index 204ed2b..a95706a 100644 --- a/testapp/settings.py +++ b/testapp/settings.py @@ -152,7 +152,7 @@ INSTALLED_APPS = ( 'exam', 'taggit_autocomplete_modified', 'debug_toolbar', - 'django_extensions', + #'django_extensions', ) # A sample logging configuration. The only tangible logging -- cgit From 934462800e5053df293c61ee55e23d9fd337b301 Mon Sep 17 00:00:00 2001 From: jayparikh111 Date: Fri, 2 Nov 2012 15:17:27 +0530 Subject: minor changes --- testapp/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testapp/settings.py b/testapp/settings.py index a95706a..2f5c359 100644 --- a/testapp/settings.py +++ b/testapp/settings.py @@ -151,7 +151,7 @@ INSTALLED_APPS = ( # 'south', 'exam', 'taggit_autocomplete_modified', - 'debug_toolbar', + #'debug_toolbar', #'django_extensions', ) -- cgit From 3e8006b5a7ada3eeac429490a9a8dff24ca442bb Mon Sep 17 00:00:00 2001 From: jayparikh111 Date: Fri, 2 Nov 2012 15:19:09 +0530 Subject: minor changes --- production.cfg | 3 +++ testapp/settings.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/production.cfg b/production.cfg index 0739e07..318fb12 100644 --- a/production.cfg +++ b/production.cfg @@ -4,6 +4,9 @@ parts = eggs = South psycopg2 + django-taggit + django-taggit-autocomplete-modified + django-debug-toolbar versions = versions [versions] diff --git a/testapp/settings.py b/testapp/settings.py index 2f5c359..a95706a 100644 --- a/testapp/settings.py +++ b/testapp/settings.py @@ -151,7 +151,7 @@ INSTALLED_APPS = ( # 'south', 'exam', 'taggit_autocomplete_modified', - #'debug_toolbar', + 'debug_toolbar', #'django_extensions', ) -- cgit From 68b6114b700a192b8c35fd33a07b196ae344302b Mon Sep 17 00:00:00 2001 From: jayparikh111 Date: Fri, 2 Nov 2012 15:52:02 +0530 Subject: minor changes --- testapp/exam/views.py | 162 +++++++++++++++++++++++++++----------------------- 1 file changed, 88 insertions(+), 74 deletions(-) diff --git a/testapp/exam/views.py b/testapp/exam/views.py index 3c6f0e5..1228519 100644 --- a/testapp/exam/views.py +++ b/testapp/exam/views.py @@ -7,7 +7,7 @@ import datetime from django.http import HttpResponse from django.contrib.auth import login, logout, authenticate -from django.shortcuts import render_to_response, get_object_or_404, redirect +from django.shortcuts import my_render_to_response, get_object_or_404, my_redirect from django.template import RequestContext from django.http import Http404 from django.db.models import Sum @@ -24,6 +24,20 @@ OUTPUT_DIR = abspath(join(dirname(__file__), pardir, 'output')) set1 = set() set2 = set() +def my_redirect(url): + """An overridden redirect to deal with URL_ROOT-ing. See settings.py +for details.""" + return redirect(URL_ROOT + url) + +def my_render_to_response(template, context=None, **kwargs): + """Overridden render_to_response. +""" + if context is None: + context = {'URL_ROOT': URL_ROOT} + else: + context['URL_ROOT'] = URL_ROOT + return render_to_response(template, context, **kwargs) + def gen_key(no_of_chars): """Generate a random key of the number of characters.""" allowed_chars = string.digits+string.uppercase @@ -47,10 +61,10 @@ def index(request): user = request.user if user.is_authenticated(): if user.groups.filter(name='moderator').count() > 0: - return redirect('/exam/manage/') - return redirect("/exam/start/") + return my_redirect('/exam/manage/') + return my_redirect("/exam/start/") - return redirect("/exam/login/") + return my_redirect("/exam/login/") def user_register(request): """ Register a new user. @@ -58,7 +72,7 @@ def user_register(request): user = request.user if user.is_authenticated(): - return redirect("/exam/start/") + return my_redirect("/exam/start/") if request.method == "POST": form = UserRegisterForm(request.POST) @@ -68,15 +82,15 @@ def user_register(request): new_user = authenticate(username = u_name, password = pwd) login(request, new_user) - return redirect("/exam/start/") + return my_redirect("/exam/start/") else: - return render_to_response('exam/register.html', + return my_render_to_response('exam/register.html', {'form':form}, context_instance=RequestContext(request)) else: form = UserRegisterForm() - return render_to_response('exam/register.html', + return my_render_to_response('exam/register.html', {'form':form}, context_instance=RequestContext(request)) @@ -89,7 +103,7 @@ def quizlist_user(request): if user_answerpapers.count() == 0: context = {'quizzes':avail_quiz} - return render_to_response("exam/quizzes_user.html",context) + return my_render_to_response("exam/quizzes_user.html",context) for paper in user_answerpapers: for quiz in avail_quiz: @@ -97,7 +111,7 @@ def quizlist_user(request): avail_quiz.remove(quiz) context = {'quizzes':avail_quiz,'user':user} - return render_to_response("exam/quizzes_user.html",context) + return my_render_to_response("exam/quizzes_user.html",context) def results_user(request): """Show list of Results of Quizzes that is taken by logged-in user.""" @@ -110,7 +124,7 @@ def results_user(request): temp.append(paper.get_total_marks()) quiz_marks.append(temp) context = {'papers':quiz_marks} - return render_to_response("exam/results_user.html",context) + return my_render_to_response("exam/results_user.html",context) def edit_quiz(request): """Edit the list of quizzes seleted by the user for editing.""" @@ -141,7 +155,7 @@ def edit_quiz(request): tag = tags_split[i].strip() quiz.tags.add(tag) j += 1 - return redirect("/exam/manage/showquiz/") + return my_redirect("/exam/manage/showquiz/") def edit_question(request): """Edit the list of questions seleted by the user for editing.""" @@ -177,7 +191,7 @@ def edit_question(request): tag = tags_split[i].strip() question.tags.add(tag) j += 1 - return redirect("/exam/manage/questions") + return my_redirect("/exam/manage/questions") def add_question(request,question_id=None): @@ -196,7 +210,7 @@ def add_question(request,question_id=None): for i in range(0,len(tags)-1): tag = tags[i].strip() question.tags.add(tag) - return redirect("/exam/manage/questions") + return my_redirect("/exam/manage/questions") else: d = Question.objects.get(id=question_id) @@ -215,16 +229,16 @@ def add_question(request,question_id=None): for i in range(0,len(tags)-1): tag = tags[i].strip() question.tags.add(tag) - return redirect("/exam/manage/questions") + return my_redirect("/exam/manage/questions") else: - return render_to_response('exam/add_question.html', + return my_render_to_response('exam/add_question.html', {'form':form}, context_instance=RequestContext(request)) else: if question_id == None: form = QuestionForm() - return render_to_response('exam/add_question.html', + return my_render_to_response('exam/add_question.html', {'form':form}, context_instance=RequestContext(request)) else: @@ -247,7 +261,7 @@ def add_question(request,question_id=None): if (initial_tags == ","): initial_tags = "" form.initial['tags']=initial_tags - return render_to_response('exam/add_question.html',{'form':form},context_instance=RequestContext(request)) + return my_render_to_response('exam/add_question.html',{'form':form},context_instance=RequestContext(request)) def add_quiz(request,quiz_id=None): @@ -267,7 +281,7 @@ def add_quiz(request,quiz_id=None): for tag in tags: tag = tag.strip() quiz.tags.add(tag) - return redirect("/exam/manage/designquestionpaper") + return my_redirect("/exam/manage/designquestionpaper") else: d = Quiz.objects.get(id=quiz_id) d.start_date = form['start_date'].data @@ -282,16 +296,16 @@ def add_quiz(request,quiz_id=None): for i in range(0,len(tags)-1): tag = tags[i].strip() quiz.tags.add(tag) - return redirect("/exam/manage/showquiz") + return my_redirect("/exam/manage/showquiz") else: - return render_to_response('exam/add_quiz.html', + return my_render_to_response('exam/add_quiz.html', {'form':form}, context_instance=RequestContext(request)) else: if quiz_id == None: form = QuizForm() - return render_to_response('exam/add_quiz.html', + return my_render_to_response('exam/add_quiz.html', {'form':form}, context_instance=RequestContext(request)) else: @@ -310,14 +324,14 @@ def add_quiz(request,quiz_id=None): if (initial_tags == ","): initial_tags = "" form.initial['tags']=initial_tags - return render_to_response('exam/add_quiz.html',{'form':form},context_instance=RequestContext(request)) + return my_render_to_response('exam/add_quiz.html',{'form':form},context_instance=RequestContext(request)) def design_questionpaper(request,questionpaper_id=None): user=request.user if not user.is_authenticated() or user.groups.filter(name='moderator').count() == 0 : raise Http404('You are not allowed to view this page!') - return render_to_response('exam/add_questionpaper.html',{},context_instance=RequestContext(request)) + return my_render_to_response('exam/add_questionpaper.html',{},context_instance=RequestContext(request)) def show_all_questionpapers(request,questionpaper_id=None): @@ -326,7 +340,7 @@ def show_all_questionpapers(request,questionpaper_id=None): raise Http404('You are not allowed to view this page!') if request.method=="POST" and request.POST.get('add') == "add": - return redirect("/exam/manage/designquestionpaper/" + questionpaper_id) + return my_redirect("/exam/manage/designquestionpaper/" + questionpaper_id) if request.method=="POST" and request.POST.get('delete') == "delete": data = request.POST.getlist('papers') @@ -334,16 +348,16 @@ def show_all_questionpapers(request,questionpaper_id=None): q_paper = QuestionPaper.objects.get(id=i).delete() question_paper= QuestionPaper.objects.all() context = {'papers': question_paper, } - return render_to_response('exam/showquestionpapers.html', context, + return my_render_to_response('exam/showquestionpapers.html', context, context_instance=RequestContext(request)) qu_papers = QuestionPaper.objects.all() context = {'papers':qu_papers} - return render_to_response('exam/showquestionpapers.html',context,context_instance=RequestContext(request)) + return my_render_to_response('exam/showquestionpapers.html',context,context_instance=RequestContext(request)) if questionpaper_id == None: qu_papers = QuestionPaper.objects.all() context = {'papers':qu_papers} - return render_to_response('exam/showquestionpapers.html',context,context_instance=RequestContext(request)) + return my_render_to_response('exam/showquestionpapers.html',context,context_instance=RequestContext(request)) else: qu_papers = QuestionPaper.objects.get(id=questionpaper_id) quiz = qu_papers.quiz @@ -352,7 +366,7 @@ def show_all_questionpapers(request,questionpaper_id=None): for i in questions: q.append(i) context = {'papers':{'quiz':quiz,'questions':q}} - return render_to_response('exam/editquestionpaper.html',context,context_instance=RequestContext(request)) + return my_render_to_response('exam/editquestionpaper.html',context,context_instance=RequestContext(request)) def automatic_questionpaper(request,questionpaper_id=None): @@ -373,7 +387,7 @@ def automatic_questionpaper(request,questionpaper_id=None): for i in set2: q = Question.objects.get(summary=i) quest_paper.questions.add(q) - return redirect('/exam/manage/showquiz') + return my_redirect('/exam/manage/showquiz') else: set1 = set() set2 = set() @@ -408,11 +422,11 @@ def automatic_questionpaper(request,questionpaper_id=None): msg = 'The given Criteria does not satisfy the number of Questions...' tags = Tag.objects.all() context = {'data':{'questions':set2,'tags':tags,'msg':msg}} - return render_to_response('exam/automatic_questionpaper.html',context,context_instance=RequestContext(request)) + return my_render_to_response('exam/automatic_questionpaper.html',context,context_instance=RequestContext(request)) else: tags = Tag.objects.all() context = {'data':{'tags':tags}} - return render_to_response('exam/automatic_questionpaper.html',context,context_instance=RequestContext(request)) + return my_render_to_response('exam/automatic_questionpaper.html',context,context_instance=RequestContext(request)) else: if request.method=="POST": @@ -422,7 +436,7 @@ def automatic_questionpaper(request,questionpaper_id=None): print str(i.id) + " " + i.summary q = Question.objects.get(summary=i) quest_paper.questions.add(q) - return redirect('/exam/manage/showquiz') + return my_redirect('/exam/manage/showquiz') else: set1 = set() set2 = set() @@ -457,11 +471,11 @@ def automatic_questionpaper(request,questionpaper_id=None): msg = 'The given Criteria does not satisfy the number of Questions...' tags = Tag.objects.all() context = {'data':{'questions':set2,'tags':tags,'msg':msg}} - return render_to_response('exam/automatic_questionpaper.html',context,context_instance=RequestContext(request)) + return my_render_to_response('exam/automatic_questionpaper.html',context,context_instance=RequestContext(request)) else: tags = Tag.objects.all() context = {'data':{'tags':tags}} - return render_to_response('exam/automatic_questionpaper.html',context,context_instance=RequestContext(request)) + return my_render_to_response('exam/automatic_questionpaper.html',context,context_instance=RequestContext(request)) def manual_questionpaper(request,questionpaper_id=None): user=request.user @@ -481,7 +495,7 @@ def manual_questionpaper(request,questionpaper_id=None): for i in questions: q = Question.objects.get(id=i) quest_paper.questions.add(q) - return redirect('/exam/manage/showquiz') + return my_redirect('/exam/manage/showquiz') else: set1 = set() set2 = set() @@ -511,11 +525,11 @@ def manual_questionpaper(request,questionpaper_id=None): msg = 'No matching Question found...' tags = Tag.objects.all() context = {'data':{'questions':set2,'tags':tags,'msg':msg}} - return render_to_response('exam/manual_questionpaper.html',context,context_instance=RequestContext(request)) + return my_render_to_response('exam/manual_questionpaper.html',context,context_instance=RequestContext(request)) else: tags = Tag.objects.all() context = {'data':{'tags':tags}} - return render_to_response('exam/manual_questionpaper.html',context,context_instance=RequestContext(request)) + return my_render_to_response('exam/manual_questionpaper.html',context,context_instance=RequestContext(request)) else: if request.method=="POST": @@ -525,7 +539,7 @@ def manual_questionpaper(request,questionpaper_id=None): for i in questions: q = Question.objects.get(id=i) quest_paper.questions.add(q) - return redirect('/exam/manage/showquiz') + return my_redirect('/exam/manage/showquiz') else: set1 = set() set2 = set() @@ -555,11 +569,11 @@ def manual_questionpaper(request,questionpaper_id=None): msg = 'No matching Question found...' tags = Tag.objects.all() context = {'data':{'questions':set2,'tags':tags,'msg':msg}} - return render_to_response('exam/manual_questionpaper.html',context,context_instance=RequestContext(request)) + return my_render_to_response('exam/manual_questionpaper.html',context,context_instance=RequestContext(request)) else: tags = Tag.objects.all() context = {'data':{'tags':tags}} - return render_to_response('exam/manual_questionpaper.html',context,context_instance=RequestContext(request)) + return my_render_to_response('exam/manual_questionpaper.html',context,context_instance=RequestContext(request)) @@ -570,8 +584,8 @@ def prof_manage(request): user = request.user if user.is_authenticated() and user.groups.filter(name='moderator').count() > 0: context = {'user':user} - return render_to_response('manage.html',context) - return redirect('/exam/login/') + return my_render_to_response('manage.html',context) + return my_redirect('/exam/login/') def user_login(request): """Take the credentials of the user and log the user in.""" @@ -579,8 +593,8 @@ def user_login(request): user = request.user if user.is_authenticated(): if user.groups.filter(name='moderator').count() > 0 : - return redirect('/exam/manage/') - return redirect("/exam/intro/") + return my_redirect('/exam/manage/') + return my_redirect("/exam/intro/") if request.method == "POST": form = UserLoginForm(request.POST) @@ -588,23 +602,23 @@ def user_login(request): user = form.cleaned_data login(request, user) if user.groups.filter(name='moderator').count() > 0 : - return redirect('/exam/manage/') - return redirect('/exam/login/') + return my_redirect('/exam/manage/') + return my_redirect('/exam/login/') else: context = {"form": form} - return render_to_response('exam/login.html', context, + return my_render_to_response('exam/login.html', context, context_instance=RequestContext(request)) else: form = UserLoginForm() context = {"form": form} - return render_to_response('exam/login.html', context, + return my_render_to_response('exam/login.html', context, context_instance=RequestContext(request)) def start(request,questionpaper_id=None): """Check the user cedentials and if any quiz is available, start the exam.""" user = request.user if questionpaper_id == None: - return redirect('/exam/quizzes/') + return my_redirect('/exam/quizzes/') try: # Right now the app is designed so there is only one active quiz # at a particular time. @@ -645,7 +659,7 @@ def start(request,questionpaper_id=None): # Show the user the intro page. context = {'user': user,'paper_id':questionpaper_id} ci = RequestContext(request) - return render_to_response('exam/intro.html', context, + return my_render_to_response('exam/intro.html', context, context_instance=ci) def question(request, q_id, questionpaper_id): @@ -653,13 +667,13 @@ def question(request, q_id, questionpaper_id): user = request.user if not user.is_authenticated(): - return redirect('/exam/login/') + return my_redirect('/exam/login/') q = get_object_or_404(Question, pk=q_id) try: q_paper = QuestionPaper.objects.get(id=questionpaper_id) paper = AnswerPaper.objects.get(user=request.user, question_paper=q_paper) except AnswerPaper.DoesNotExist: - return redirect('/exam/start/') + return my_redirect('/exam/start/') if not paper.question_paper.quiz.active: return complete(request, reason='The quiz has been deactivated!') @@ -671,7 +685,7 @@ def question(request, q_id, questionpaper_id): 'quiz_name': quiz_name, 'time_left': time_left} ci = RequestContext(request) - return render_to_response('exam/question.html', context, + return my_render_to_response('exam/question.html', context, context_instance=ci) def show_question(request, q_id, questionpaper_id): @@ -687,7 +701,7 @@ def check(request, q_id, questionpaper_id=None): user = request.user if not user.is_authenticated(): - return redirect('/exam/login/') + return my_redirect('/exam/login/') question = get_object_or_404(Question, pk=q_id) q_paper = QuestionPaper.objects.get(id=questionpaper_id) paper = AnswerPaper.objects.get(user=request.user,question_paper = q_paper) @@ -739,7 +753,7 @@ def check(request, q_id, questionpaper_id=None): 'time_left': time_left} ci = RequestContext(request) - return render_to_response('exam/question.html', context, + return my_render_to_response('exam/question.html', context, context_instance=ci) else: next_q = paper.completed_question(question.id) @@ -748,7 +762,7 @@ def check(request, q_id, questionpaper_id=None): def quit(request, answerpaper_id=None): """Show the quit page when the user logs out.""" context = { 'id':answerpaper_id} - return render_to_response('exam/quit.html',context,context_instance=RequestContext(request)) + return my_render_to_response('exam/quit.html',context,context_instance=RequestContext(request)) def complete(request,reason = None,answerpaper_id=None): """Show a page to inform user that the quiz has been compeleted.""" @@ -758,7 +772,7 @@ def complete(request,reason = None,answerpaper_id=None): if answerpaper_id == None: logout(request) context = {'message': "You are successfully Logged out."} - return render_to_response('exam/complete.html', context) + return my_render_to_response('exam/complete.html', context) no = False message = reason or 'The quiz has been completed. Thank you.' if user.groups.filter(name='moderator').count() > 0: @@ -770,9 +784,9 @@ def complete(request,reason = None,answerpaper_id=None): answer_paper = AnswerPaper.objects.get(id=answerpaper_id) answer_paper.endtime = datetime.datetime.now() answer_paper.save() - return redirect('/exam/quizzes/') + return my_redirect('/exam/quizzes/') else: - return redirect('/exam/') + return my_redirect('/exam/') def monitor(request, quiz_id=None): """Monitor the progress of the papers taken so far.""" @@ -786,7 +800,7 @@ def monitor(request, quiz_id=None): context = {'papers': [], 'quiz': None, 'quizzes':q_paper} - return render_to_response('exam/monitor.html', context, + return my_render_to_response('exam/monitor.html', context, context_instance=RequestContext(request)) # quiz_id is not None. try: @@ -799,7 +813,7 @@ def monitor(request, quiz_id=None): total=Sum('answers__marks')).order_by('-total') context = {'papers': papers, 'quiz': quiz, 'quizzes': None} - return render_to_response('exam/monitor.html', context, + return my_render_to_response('exam/monitor.html', context, context_instance=RequestContext(request)) def get_user_data(username): @@ -829,7 +843,7 @@ def show_all_users(request): user = User.objects.filter(username__contains="") questionpaper = AnswerPaper.objects.all() context = { 'question': questionpaper } - return render_to_response('exam/showusers.html',context,context_instance=RequestContext(request)) + return my_render_to_response('exam/showusers.html',context,context_instance=RequestContext(request)) def show_all_quiz(request): """Generates a list of all the quizzes that are currently in the database.""" @@ -846,7 +860,7 @@ def show_all_quiz(request): context = {'papers': [], 'quiz': None, 'quizzes':quizzes} - return render_to_response('exam/show_quiz.html', context, + return my_render_to_response('exam/show_quiz.html', context, context_instance=RequestContext(request)) else: for i in data: @@ -855,7 +869,7 @@ def show_all_quiz(request): context = {'papers': [], 'quiz': None, 'quizzes':quizzes} - return render_to_response('exam/show_quiz.html', context, + return my_render_to_response('exam/show_quiz.html', context, context_instance=RequestContext(request)) elif request.method == 'POST' and request.POST.get('edit')=='edit': @@ -877,7 +891,7 @@ def show_all_quiz(request): initial_tags = "" form.initial['tags']=initial_tags forms.append(form) - return render_to_response('exam/edit_quiz.html',{'forms':forms,'data':data}, + return my_render_to_response('exam/edit_quiz.html',{'forms':forms,'data':data}, context_instance=RequestContext(request)) else: @@ -885,7 +899,7 @@ def show_all_quiz(request): context = {'papers': [], 'quiz': None, 'quizzes':quizzes} - return render_to_response('exam/show_quiz.html', context, + return my_render_to_response('exam/show_quiz.html', context, context_instance=RequestContext(request)) @@ -903,7 +917,7 @@ def show_all_questions(request): context = {'papers': [], 'question': None, 'questions':questions} - return render_to_response('exam/showquestions.html', context, + return my_render_to_response('exam/showquestions.html', context, context_instance=RequestContext(request)) else: for i in data: @@ -912,7 +926,7 @@ def show_all_questions(request): context = {'papers': [], 'question': None, 'questions':questions} - return render_to_response('exam/showquestions.html', context, + return my_render_to_response('exam/showquestions.html', context, context_instance=RequestContext(request)) elif request.method == 'POST' and request.POST.get('edit')=='edit': @@ -938,14 +952,14 @@ def show_all_questions(request): initial_tags = "" form.initial['tags']=initial_tags forms.append(form) - return render_to_response('exam/edit_question.html',{'forms':forms,'data':data},context_instance=RequestContext(request)) + return my_render_to_response('exam/edit_question.html',{'forms':forms,'data':data},context_instance=RequestContext(request)) else: questions = Question.objects.all() context = {'papers': [], 'question': None, 'questions':questions} - return render_to_response('exam/showquestions.html', context, + return my_render_to_response('exam/showquestions.html', context, context_instance=RequestContext(request)) def user_data(request, username): @@ -958,7 +972,7 @@ def user_data(request, username): data = get_user_data(username) context = {'data': data} - return render_to_response('exam/user_data.html', context, + return my_render_to_response('exam/user_data.html', context, context_instance=RequestContext(request)) def grade_user(request, username): @@ -982,9 +996,9 @@ def grade_user(request, username): paper.save() context = {'data': data} - return render_to_response('exam/user_data.html', context, + return my_render_to_response('exam/user_data.html', context, context_instance=RequestContext(request)) else: context = {'data': data} - return render_to_response('exam/grade_user.html', context, + return my_render_to_response('exam/grade_user.html', context, context_instance=RequestContext(request)) -- cgit From a0d705621cce25b933da541cb66d93618e2153b7 Mon Sep 17 00:00:00 2001 From: jayparikh111 Date: Fri, 2 Nov 2012 16:01:51 +0530 Subject: minor changes --- testapp/exam/views.py | 162 +++++++++++++++++++++++--------------------------- 1 file changed, 74 insertions(+), 88 deletions(-) diff --git a/testapp/exam/views.py b/testapp/exam/views.py index 1228519..3c6f0e5 100644 --- a/testapp/exam/views.py +++ b/testapp/exam/views.py @@ -7,7 +7,7 @@ import datetime from django.http import HttpResponse from django.contrib.auth import login, logout, authenticate -from django.shortcuts import my_render_to_response, get_object_or_404, my_redirect +from django.shortcuts import render_to_response, get_object_or_404, redirect from django.template import RequestContext from django.http import Http404 from django.db.models import Sum @@ -24,20 +24,6 @@ OUTPUT_DIR = abspath(join(dirname(__file__), pardir, 'output')) set1 = set() set2 = set() -def my_redirect(url): - """An overridden redirect to deal with URL_ROOT-ing. See settings.py -for details.""" - return redirect(URL_ROOT + url) - -def my_render_to_response(template, context=None, **kwargs): - """Overridden render_to_response. -""" - if context is None: - context = {'URL_ROOT': URL_ROOT} - else: - context['URL_ROOT'] = URL_ROOT - return render_to_response(template, context, **kwargs) - def gen_key(no_of_chars): """Generate a random key of the number of characters.""" allowed_chars = string.digits+string.uppercase @@ -61,10 +47,10 @@ def index(request): user = request.user if user.is_authenticated(): if user.groups.filter(name='moderator').count() > 0: - return my_redirect('/exam/manage/') - return my_redirect("/exam/start/") + return redirect('/exam/manage/') + return redirect("/exam/start/") - return my_redirect("/exam/login/") + return redirect("/exam/login/") def user_register(request): """ Register a new user. @@ -72,7 +58,7 @@ def user_register(request): user = request.user if user.is_authenticated(): - return my_redirect("/exam/start/") + return redirect("/exam/start/") if request.method == "POST": form = UserRegisterForm(request.POST) @@ -82,15 +68,15 @@ def user_register(request): new_user = authenticate(username = u_name, password = pwd) login(request, new_user) - return my_redirect("/exam/start/") + return redirect("/exam/start/") else: - return my_render_to_response('exam/register.html', + return render_to_response('exam/register.html', {'form':form}, context_instance=RequestContext(request)) else: form = UserRegisterForm() - return my_render_to_response('exam/register.html', + return render_to_response('exam/register.html', {'form':form}, context_instance=RequestContext(request)) @@ -103,7 +89,7 @@ def quizlist_user(request): if user_answerpapers.count() == 0: context = {'quizzes':avail_quiz} - return my_render_to_response("exam/quizzes_user.html",context) + return render_to_response("exam/quizzes_user.html",context) for paper in user_answerpapers: for quiz in avail_quiz: @@ -111,7 +97,7 @@ def quizlist_user(request): avail_quiz.remove(quiz) context = {'quizzes':avail_quiz,'user':user} - return my_render_to_response("exam/quizzes_user.html",context) + return render_to_response("exam/quizzes_user.html",context) def results_user(request): """Show list of Results of Quizzes that is taken by logged-in user.""" @@ -124,7 +110,7 @@ def results_user(request): temp.append(paper.get_total_marks()) quiz_marks.append(temp) context = {'papers':quiz_marks} - return my_render_to_response("exam/results_user.html",context) + return render_to_response("exam/results_user.html",context) def edit_quiz(request): """Edit the list of quizzes seleted by the user for editing.""" @@ -155,7 +141,7 @@ def edit_quiz(request): tag = tags_split[i].strip() quiz.tags.add(tag) j += 1 - return my_redirect("/exam/manage/showquiz/") + return redirect("/exam/manage/showquiz/") def edit_question(request): """Edit the list of questions seleted by the user for editing.""" @@ -191,7 +177,7 @@ def edit_question(request): tag = tags_split[i].strip() question.tags.add(tag) j += 1 - return my_redirect("/exam/manage/questions") + return redirect("/exam/manage/questions") def add_question(request,question_id=None): @@ -210,7 +196,7 @@ def add_question(request,question_id=None): for i in range(0,len(tags)-1): tag = tags[i].strip() question.tags.add(tag) - return my_redirect("/exam/manage/questions") + return redirect("/exam/manage/questions") else: d = Question.objects.get(id=question_id) @@ -229,16 +215,16 @@ def add_question(request,question_id=None): for i in range(0,len(tags)-1): tag = tags[i].strip() question.tags.add(tag) - return my_redirect("/exam/manage/questions") + return redirect("/exam/manage/questions") else: - return my_render_to_response('exam/add_question.html', + return render_to_response('exam/add_question.html', {'form':form}, context_instance=RequestContext(request)) else: if question_id == None: form = QuestionForm() - return my_render_to_response('exam/add_question.html', + return render_to_response('exam/add_question.html', {'form':form}, context_instance=RequestContext(request)) else: @@ -261,7 +247,7 @@ def add_question(request,question_id=None): if (initial_tags == ","): initial_tags = "" form.initial['tags']=initial_tags - return my_render_to_response('exam/add_question.html',{'form':form},context_instance=RequestContext(request)) + return render_to_response('exam/add_question.html',{'form':form},context_instance=RequestContext(request)) def add_quiz(request,quiz_id=None): @@ -281,7 +267,7 @@ def add_quiz(request,quiz_id=None): for tag in tags: tag = tag.strip() quiz.tags.add(tag) - return my_redirect("/exam/manage/designquestionpaper") + return redirect("/exam/manage/designquestionpaper") else: d = Quiz.objects.get(id=quiz_id) d.start_date = form['start_date'].data @@ -296,16 +282,16 @@ def add_quiz(request,quiz_id=None): for i in range(0,len(tags)-1): tag = tags[i].strip() quiz.tags.add(tag) - return my_redirect("/exam/manage/showquiz") + return redirect("/exam/manage/showquiz") else: - return my_render_to_response('exam/add_quiz.html', + return render_to_response('exam/add_quiz.html', {'form':form}, context_instance=RequestContext(request)) else: if quiz_id == None: form = QuizForm() - return my_render_to_response('exam/add_quiz.html', + return render_to_response('exam/add_quiz.html', {'form':form}, context_instance=RequestContext(request)) else: @@ -324,14 +310,14 @@ def add_quiz(request,quiz_id=None): if (initial_tags == ","): initial_tags = "" form.initial['tags']=initial_tags - return my_render_to_response('exam/add_quiz.html',{'form':form},context_instance=RequestContext(request)) + return render_to_response('exam/add_quiz.html',{'form':form},context_instance=RequestContext(request)) def design_questionpaper(request,questionpaper_id=None): user=request.user if not user.is_authenticated() or user.groups.filter(name='moderator').count() == 0 : raise Http404('You are not allowed to view this page!') - return my_render_to_response('exam/add_questionpaper.html',{},context_instance=RequestContext(request)) + return render_to_response('exam/add_questionpaper.html',{},context_instance=RequestContext(request)) def show_all_questionpapers(request,questionpaper_id=None): @@ -340,7 +326,7 @@ def show_all_questionpapers(request,questionpaper_id=None): raise Http404('You are not allowed to view this page!') if request.method=="POST" and request.POST.get('add') == "add": - return my_redirect("/exam/manage/designquestionpaper/" + questionpaper_id) + return redirect("/exam/manage/designquestionpaper/" + questionpaper_id) if request.method=="POST" and request.POST.get('delete') == "delete": data = request.POST.getlist('papers') @@ -348,16 +334,16 @@ def show_all_questionpapers(request,questionpaper_id=None): q_paper = QuestionPaper.objects.get(id=i).delete() question_paper= QuestionPaper.objects.all() context = {'papers': question_paper, } - return my_render_to_response('exam/showquestionpapers.html', context, + return render_to_response('exam/showquestionpapers.html', context, context_instance=RequestContext(request)) qu_papers = QuestionPaper.objects.all() context = {'papers':qu_papers} - return my_render_to_response('exam/showquestionpapers.html',context,context_instance=RequestContext(request)) + return render_to_response('exam/showquestionpapers.html',context,context_instance=RequestContext(request)) if questionpaper_id == None: qu_papers = QuestionPaper.objects.all() context = {'papers':qu_papers} - return my_render_to_response('exam/showquestionpapers.html',context,context_instance=RequestContext(request)) + return render_to_response('exam/showquestionpapers.html',context,context_instance=RequestContext(request)) else: qu_papers = QuestionPaper.objects.get(id=questionpaper_id) quiz = qu_papers.quiz @@ -366,7 +352,7 @@ def show_all_questionpapers(request,questionpaper_id=None): for i in questions: q.append(i) context = {'papers':{'quiz':quiz,'questions':q}} - return my_render_to_response('exam/editquestionpaper.html',context,context_instance=RequestContext(request)) + return render_to_response('exam/editquestionpaper.html',context,context_instance=RequestContext(request)) def automatic_questionpaper(request,questionpaper_id=None): @@ -387,7 +373,7 @@ def automatic_questionpaper(request,questionpaper_id=None): for i in set2: q = Question.objects.get(summary=i) quest_paper.questions.add(q) - return my_redirect('/exam/manage/showquiz') + return redirect('/exam/manage/showquiz') else: set1 = set() set2 = set() @@ -422,11 +408,11 @@ def automatic_questionpaper(request,questionpaper_id=None): msg = 'The given Criteria does not satisfy the number of Questions...' tags = Tag.objects.all() context = {'data':{'questions':set2,'tags':tags,'msg':msg}} - return my_render_to_response('exam/automatic_questionpaper.html',context,context_instance=RequestContext(request)) + return render_to_response('exam/automatic_questionpaper.html',context,context_instance=RequestContext(request)) else: tags = Tag.objects.all() context = {'data':{'tags':tags}} - return my_render_to_response('exam/automatic_questionpaper.html',context,context_instance=RequestContext(request)) + return render_to_response('exam/automatic_questionpaper.html',context,context_instance=RequestContext(request)) else: if request.method=="POST": @@ -436,7 +422,7 @@ def automatic_questionpaper(request,questionpaper_id=None): print str(i.id) + " " + i.summary q = Question.objects.get(summary=i) quest_paper.questions.add(q) - return my_redirect('/exam/manage/showquiz') + return redirect('/exam/manage/showquiz') else: set1 = set() set2 = set() @@ -471,11 +457,11 @@ def automatic_questionpaper(request,questionpaper_id=None): msg = 'The given Criteria does not satisfy the number of Questions...' tags = Tag.objects.all() context = {'data':{'questions':set2,'tags':tags,'msg':msg}} - return my_render_to_response('exam/automatic_questionpaper.html',context,context_instance=RequestContext(request)) + return render_to_response('exam/automatic_questionpaper.html',context,context_instance=RequestContext(request)) else: tags = Tag.objects.all() context = {'data':{'tags':tags}} - return my_render_to_response('exam/automatic_questionpaper.html',context,context_instance=RequestContext(request)) + return render_to_response('exam/automatic_questionpaper.html',context,context_instance=RequestContext(request)) def manual_questionpaper(request,questionpaper_id=None): user=request.user @@ -495,7 +481,7 @@ def manual_questionpaper(request,questionpaper_id=None): for i in questions: q = Question.objects.get(id=i) quest_paper.questions.add(q) - return my_redirect('/exam/manage/showquiz') + return redirect('/exam/manage/showquiz') else: set1 = set() set2 = set() @@ -525,11 +511,11 @@ def manual_questionpaper(request,questionpaper_id=None): msg = 'No matching Question found...' tags = Tag.objects.all() context = {'data':{'questions':set2,'tags':tags,'msg':msg}} - return my_render_to_response('exam/manual_questionpaper.html',context,context_instance=RequestContext(request)) + return render_to_response('exam/manual_questionpaper.html',context,context_instance=RequestContext(request)) else: tags = Tag.objects.all() context = {'data':{'tags':tags}} - return my_render_to_response('exam/manual_questionpaper.html',context,context_instance=RequestContext(request)) + return render_to_response('exam/manual_questionpaper.html',context,context_instance=RequestContext(request)) else: if request.method=="POST": @@ -539,7 +525,7 @@ def manual_questionpaper(request,questionpaper_id=None): for i in questions: q = Question.objects.get(id=i) quest_paper.questions.add(q) - return my_redirect('/exam/manage/showquiz') + return redirect('/exam/manage/showquiz') else: set1 = set() set2 = set() @@ -569,11 +555,11 @@ def manual_questionpaper(request,questionpaper_id=None): msg = 'No matching Question found...' tags = Tag.objects.all() context = {'data':{'questions':set2,'tags':tags,'msg':msg}} - return my_render_to_response('exam/manual_questionpaper.html',context,context_instance=RequestContext(request)) + return render_to_response('exam/manual_questionpaper.html',context,context_instance=RequestContext(request)) else: tags = Tag.objects.all() context = {'data':{'tags':tags}} - return my_render_to_response('exam/manual_questionpaper.html',context,context_instance=RequestContext(request)) + return render_to_response('exam/manual_questionpaper.html',context,context_instance=RequestContext(request)) @@ -584,8 +570,8 @@ def prof_manage(request): user = request.user if user.is_authenticated() and user.groups.filter(name='moderator').count() > 0: context = {'user':user} - return my_render_to_response('manage.html',context) - return my_redirect('/exam/login/') + return render_to_response('manage.html',context) + return redirect('/exam/login/') def user_login(request): """Take the credentials of the user and log the user in.""" @@ -593,8 +579,8 @@ def user_login(request): user = request.user if user.is_authenticated(): if user.groups.filter(name='moderator').count() > 0 : - return my_redirect('/exam/manage/') - return my_redirect("/exam/intro/") + return redirect('/exam/manage/') + return redirect("/exam/intro/") if request.method == "POST": form = UserLoginForm(request.POST) @@ -602,23 +588,23 @@ def user_login(request): user = form.cleaned_data login(request, user) if user.groups.filter(name='moderator').count() > 0 : - return my_redirect('/exam/manage/') - return my_redirect('/exam/login/') + return redirect('/exam/manage/') + return redirect('/exam/login/') else: context = {"form": form} - return my_render_to_response('exam/login.html', context, + return render_to_response('exam/login.html', context, context_instance=RequestContext(request)) else: form = UserLoginForm() context = {"form": form} - return my_render_to_response('exam/login.html', context, + return render_to_response('exam/login.html', context, context_instance=RequestContext(request)) def start(request,questionpaper_id=None): """Check the user cedentials and if any quiz is available, start the exam.""" user = request.user if questionpaper_id == None: - return my_redirect('/exam/quizzes/') + return redirect('/exam/quizzes/') try: # Right now the app is designed so there is only one active quiz # at a particular time. @@ -659,7 +645,7 @@ def start(request,questionpaper_id=None): # Show the user the intro page. context = {'user': user,'paper_id':questionpaper_id} ci = RequestContext(request) - return my_render_to_response('exam/intro.html', context, + return render_to_response('exam/intro.html', context, context_instance=ci) def question(request, q_id, questionpaper_id): @@ -667,13 +653,13 @@ def question(request, q_id, questionpaper_id): user = request.user if not user.is_authenticated(): - return my_redirect('/exam/login/') + return redirect('/exam/login/') q = get_object_or_404(Question, pk=q_id) try: q_paper = QuestionPaper.objects.get(id=questionpaper_id) paper = AnswerPaper.objects.get(user=request.user, question_paper=q_paper) except AnswerPaper.DoesNotExist: - return my_redirect('/exam/start/') + return redirect('/exam/start/') if not paper.question_paper.quiz.active: return complete(request, reason='The quiz has been deactivated!') @@ -685,7 +671,7 @@ def question(request, q_id, questionpaper_id): 'quiz_name': quiz_name, 'time_left': time_left} ci = RequestContext(request) - return my_render_to_response('exam/question.html', context, + return render_to_response('exam/question.html', context, context_instance=ci) def show_question(request, q_id, questionpaper_id): @@ -701,7 +687,7 @@ def check(request, q_id, questionpaper_id=None): user = request.user if not user.is_authenticated(): - return my_redirect('/exam/login/') + return redirect('/exam/login/') question = get_object_or_404(Question, pk=q_id) q_paper = QuestionPaper.objects.get(id=questionpaper_id) paper = AnswerPaper.objects.get(user=request.user,question_paper = q_paper) @@ -753,7 +739,7 @@ def check(request, q_id, questionpaper_id=None): 'time_left': time_left} ci = RequestContext(request) - return my_render_to_response('exam/question.html', context, + return render_to_response('exam/question.html', context, context_instance=ci) else: next_q = paper.completed_question(question.id) @@ -762,7 +748,7 @@ def check(request, q_id, questionpaper_id=None): def quit(request, answerpaper_id=None): """Show the quit page when the user logs out.""" context = { 'id':answerpaper_id} - return my_render_to_response('exam/quit.html',context,context_instance=RequestContext(request)) + return render_to_response('exam/quit.html',context,context_instance=RequestContext(request)) def complete(request,reason = None,answerpaper_id=None): """Show a page to inform user that the quiz has been compeleted.""" @@ -772,7 +758,7 @@ def complete(request,reason = None,answerpaper_id=None): if answerpaper_id == None: logout(request) context = {'message': "You are successfully Logged out."} - return my_render_to_response('exam/complete.html', context) + return render_to_response('exam/complete.html', context) no = False message = reason or 'The quiz has been completed. Thank you.' if user.groups.filter(name='moderator').count() > 0: @@ -784,9 +770,9 @@ def complete(request,reason = None,answerpaper_id=None): answer_paper = AnswerPaper.objects.get(id=answerpaper_id) answer_paper.endtime = datetime.datetime.now() answer_paper.save() - return my_redirect('/exam/quizzes/') + return redirect('/exam/quizzes/') else: - return my_redirect('/exam/') + return redirect('/exam/') def monitor(request, quiz_id=None): """Monitor the progress of the papers taken so far.""" @@ -800,7 +786,7 @@ def monitor(request, quiz_id=None): context = {'papers': [], 'quiz': None, 'quizzes':q_paper} - return my_render_to_response('exam/monitor.html', context, + return render_to_response('exam/monitor.html', context, context_instance=RequestContext(request)) # quiz_id is not None. try: @@ -813,7 +799,7 @@ def monitor(request, quiz_id=None): total=Sum('answers__marks')).order_by('-total') context = {'papers': papers, 'quiz': quiz, 'quizzes': None} - return my_render_to_response('exam/monitor.html', context, + return render_to_response('exam/monitor.html', context, context_instance=RequestContext(request)) def get_user_data(username): @@ -843,7 +829,7 @@ def show_all_users(request): user = User.objects.filter(username__contains="") questionpaper = AnswerPaper.objects.all() context = { 'question': questionpaper } - return my_render_to_response('exam/showusers.html',context,context_instance=RequestContext(request)) + return render_to_response('exam/showusers.html',context,context_instance=RequestContext(request)) def show_all_quiz(request): """Generates a list of all the quizzes that are currently in the database.""" @@ -860,7 +846,7 @@ def show_all_quiz(request): context = {'papers': [], 'quiz': None, 'quizzes':quizzes} - return my_render_to_response('exam/show_quiz.html', context, + return render_to_response('exam/show_quiz.html', context, context_instance=RequestContext(request)) else: for i in data: @@ -869,7 +855,7 @@ def show_all_quiz(request): context = {'papers': [], 'quiz': None, 'quizzes':quizzes} - return my_render_to_response('exam/show_quiz.html', context, + return render_to_response('exam/show_quiz.html', context, context_instance=RequestContext(request)) elif request.method == 'POST' and request.POST.get('edit')=='edit': @@ -891,7 +877,7 @@ def show_all_quiz(request): initial_tags = "" form.initial['tags']=initial_tags forms.append(form) - return my_render_to_response('exam/edit_quiz.html',{'forms':forms,'data':data}, + return render_to_response('exam/edit_quiz.html',{'forms':forms,'data':data}, context_instance=RequestContext(request)) else: @@ -899,7 +885,7 @@ def show_all_quiz(request): context = {'papers': [], 'quiz': None, 'quizzes':quizzes} - return my_render_to_response('exam/show_quiz.html', context, + return render_to_response('exam/show_quiz.html', context, context_instance=RequestContext(request)) @@ -917,7 +903,7 @@ def show_all_questions(request): context = {'papers': [], 'question': None, 'questions':questions} - return my_render_to_response('exam/showquestions.html', context, + return render_to_response('exam/showquestions.html', context, context_instance=RequestContext(request)) else: for i in data: @@ -926,7 +912,7 @@ def show_all_questions(request): context = {'papers': [], 'question': None, 'questions':questions} - return my_render_to_response('exam/showquestions.html', context, + return render_to_response('exam/showquestions.html', context, context_instance=RequestContext(request)) elif request.method == 'POST' and request.POST.get('edit')=='edit': @@ -952,14 +938,14 @@ def show_all_questions(request): initial_tags = "" form.initial['tags']=initial_tags forms.append(form) - return my_render_to_response('exam/edit_question.html',{'forms':forms,'data':data},context_instance=RequestContext(request)) + return render_to_response('exam/edit_question.html',{'forms':forms,'data':data},context_instance=RequestContext(request)) else: questions = Question.objects.all() context = {'papers': [], 'question': None, 'questions':questions} - return my_render_to_response('exam/showquestions.html', context, + return render_to_response('exam/showquestions.html', context, context_instance=RequestContext(request)) def user_data(request, username): @@ -972,7 +958,7 @@ def user_data(request, username): data = get_user_data(username) context = {'data': data} - return my_render_to_response('exam/user_data.html', context, + return render_to_response('exam/user_data.html', context, context_instance=RequestContext(request)) def grade_user(request, username): @@ -996,9 +982,9 @@ def grade_user(request, username): paper.save() context = {'data': data} - return my_render_to_response('exam/user_data.html', context, + return render_to_response('exam/user_data.html', context, context_instance=RequestContext(request)) else: context = {'data': data} - return my_render_to_response('exam/grade_user.html', context, + return render_to_response('exam/grade_user.html', context, context_instance=RequestContext(request)) -- cgit From c547bb9200fe1c1b8116088b5dc35fcce3757b52 Mon Sep 17 00:00:00 2001 From: jayparikh111 Date: Mon, 5 Nov 2012 12:17:53 +0530 Subject: minor changes --- testapp/urls.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testapp/urls.py b/testapp/urls.py index 99d69c2..67d5c08 100644 --- a/testapp/urls.py +++ b/testapp/urls.py @@ -15,11 +15,11 @@ else: urlpatterns = patterns('', url(URL_BASE, include('exam.urls')), - + (r'^admin/', include(admin.site.urls)), # Uncomment the admin/doc line below to enable admin documentation: # url(r'^admin/doc/', include('django.contrib.admindocs.urls')), # Uncomment the next line to enable the admin: - url(ADMIN_BASE, include(admin.site.urls)), + #url(ADMIN_BASE, include(admin.site.urls)), ) -- cgit From d0238dd67d01015ecdb0947713ffd32ba3fe0010 Mon Sep 17 00:00:00 2001 From: jayparikh111 Date: Mon, 5 Nov 2012 12:33:19 +0530 Subject: minor changes --- testapp/urls.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testapp/urls.py b/testapp/urls.py index 67d5c08..55bb877 100644 --- a/testapp/urls.py +++ b/testapp/urls.py @@ -15,11 +15,11 @@ else: urlpatterns = patterns('', url(URL_BASE, include('exam.urls')), - (r'^admin/', include(admin.site.urls)), + #url(r'^admin/', include(admin.site.urls)), # Uncomment the admin/doc line below to enable admin documentation: # url(r'^admin/doc/', include('django.contrib.admindocs.urls')), # Uncomment the next line to enable the admin: - #url(ADMIN_BASE, include(admin.site.urls)), + url(ADMIN_BASE, include(admin.site.urls)), ) -- cgit From f707474335496cdb4c7b921be0675cb83f4b12d9 Mon Sep 17 00:00:00 2001 From: jayparikh111 Date: Mon, 5 Nov 2012 12:36:29 +0530 Subject: minor changes --- testapp/exam/views.py | 160 +++++++++++++++++++++++++++----------------------- 1 file changed, 87 insertions(+), 73 deletions(-) diff --git a/testapp/exam/views.py b/testapp/exam/views.py index 3c6f0e5..9ec4ad4 100644 --- a/testapp/exam/views.py +++ b/testapp/exam/views.py @@ -24,6 +24,20 @@ OUTPUT_DIR = abspath(join(dirname(__file__), pardir, 'output')) set1 = set() set2 = set() +def my_redirect(url): + """An overridden redirect to deal with URL_ROOT-ing. See settings.py +for details.""" + return redirect(URL_ROOT + url) + +def my_render_to_response(template, context=None, **kwargs): + """Overridden render_to_response. +""" + if context is None: + context = {'URL_ROOT': URL_ROOT} + else: + context['URL_ROOT'] = URL_ROOT + return render_to_response(template, context, **kwargs) + def gen_key(no_of_chars): """Generate a random key of the number of characters.""" allowed_chars = string.digits+string.uppercase @@ -47,10 +61,10 @@ def index(request): user = request.user if user.is_authenticated(): if user.groups.filter(name='moderator').count() > 0: - return redirect('/exam/manage/') - return redirect("/exam/start/") + return my_redirect('/exam/manage/') + return my_redirect("/exam/start/") - return redirect("/exam/login/") + return my_redirect("/exam/login/") def user_register(request): """ Register a new user. @@ -58,7 +72,7 @@ def user_register(request): user = request.user if user.is_authenticated(): - return redirect("/exam/start/") + return my_redirect("/exam/start/") if request.method == "POST": form = UserRegisterForm(request.POST) @@ -68,15 +82,15 @@ def user_register(request): new_user = authenticate(username = u_name, password = pwd) login(request, new_user) - return redirect("/exam/start/") + return my_redirect("/exam/start/") else: - return render_to_response('exam/register.html', + return my_render_to_response('exam/register.html', {'form':form}, context_instance=RequestContext(request)) else: form = UserRegisterForm() - return render_to_response('exam/register.html', + return my_render_to_response('exam/register.html', {'form':form}, context_instance=RequestContext(request)) @@ -89,7 +103,7 @@ def quizlist_user(request): if user_answerpapers.count() == 0: context = {'quizzes':avail_quiz} - return render_to_response("exam/quizzes_user.html",context) + return my_render_to_response("exam/quizzes_user.html",context) for paper in user_answerpapers: for quiz in avail_quiz: @@ -97,7 +111,7 @@ def quizlist_user(request): avail_quiz.remove(quiz) context = {'quizzes':avail_quiz,'user':user} - return render_to_response("exam/quizzes_user.html",context) + return my_render_to_response("exam/quizzes_user.html",context) def results_user(request): """Show list of Results of Quizzes that is taken by logged-in user.""" @@ -110,7 +124,7 @@ def results_user(request): temp.append(paper.get_total_marks()) quiz_marks.append(temp) context = {'papers':quiz_marks} - return render_to_response("exam/results_user.html",context) + return my_render_to_response("exam/results_user.html",context) def edit_quiz(request): """Edit the list of quizzes seleted by the user for editing.""" @@ -141,7 +155,7 @@ def edit_quiz(request): tag = tags_split[i].strip() quiz.tags.add(tag) j += 1 - return redirect("/exam/manage/showquiz/") + return my_redirect("/exam/manage/showquiz/") def edit_question(request): """Edit the list of questions seleted by the user for editing.""" @@ -177,7 +191,7 @@ def edit_question(request): tag = tags_split[i].strip() question.tags.add(tag) j += 1 - return redirect("/exam/manage/questions") + return my_redirect("/exam/manage/questions") def add_question(request,question_id=None): @@ -196,7 +210,7 @@ def add_question(request,question_id=None): for i in range(0,len(tags)-1): tag = tags[i].strip() question.tags.add(tag) - return redirect("/exam/manage/questions") + return my_redirect("/exam/manage/questions") else: d = Question.objects.get(id=question_id) @@ -215,16 +229,16 @@ def add_question(request,question_id=None): for i in range(0,len(tags)-1): tag = tags[i].strip() question.tags.add(tag) - return redirect("/exam/manage/questions") + return my_redirect("/exam/manage/questions") else: - return render_to_response('exam/add_question.html', + return my_render_to_response('exam/add_question.html', {'form':form}, context_instance=RequestContext(request)) else: if question_id == None: form = QuestionForm() - return render_to_response('exam/add_question.html', + return my_render_to_response('exam/add_question.html', {'form':form}, context_instance=RequestContext(request)) else: @@ -247,7 +261,7 @@ def add_question(request,question_id=None): if (initial_tags == ","): initial_tags = "" form.initial['tags']=initial_tags - return render_to_response('exam/add_question.html',{'form':form},context_instance=RequestContext(request)) + return my_render_to_response('exam/add_question.html',{'form':form},context_instance=RequestContext(request)) def add_quiz(request,quiz_id=None): @@ -267,7 +281,7 @@ def add_quiz(request,quiz_id=None): for tag in tags: tag = tag.strip() quiz.tags.add(tag) - return redirect("/exam/manage/designquestionpaper") + return my_redirect("/exam/manage/designquestionpaper") else: d = Quiz.objects.get(id=quiz_id) d.start_date = form['start_date'].data @@ -282,16 +296,16 @@ def add_quiz(request,quiz_id=None): for i in range(0,len(tags)-1): tag = tags[i].strip() quiz.tags.add(tag) - return redirect("/exam/manage/showquiz") + return my_redirect("/exam/manage/showquiz") else: - return render_to_response('exam/add_quiz.html', + return my_render_to_response('exam/add_quiz.html', {'form':form}, context_instance=RequestContext(request)) else: if quiz_id == None: form = QuizForm() - return render_to_response('exam/add_quiz.html', + return my_render_to_response('exam/add_quiz.html', {'form':form}, context_instance=RequestContext(request)) else: @@ -310,14 +324,14 @@ def add_quiz(request,quiz_id=None): if (initial_tags == ","): initial_tags = "" form.initial['tags']=initial_tags - return render_to_response('exam/add_quiz.html',{'form':form},context_instance=RequestContext(request)) + return my_render_to_response('exam/add_quiz.html',{'form':form},context_instance=RequestContext(request)) def design_questionpaper(request,questionpaper_id=None): user=request.user if not user.is_authenticated() or user.groups.filter(name='moderator').count() == 0 : raise Http404('You are not allowed to view this page!') - return render_to_response('exam/add_questionpaper.html',{},context_instance=RequestContext(request)) + return my_render_to_response('exam/add_questionpaper.html',{},context_instance=RequestContext(request)) def show_all_questionpapers(request,questionpaper_id=None): @@ -326,7 +340,7 @@ def show_all_questionpapers(request,questionpaper_id=None): raise Http404('You are not allowed to view this page!') if request.method=="POST" and request.POST.get('add') == "add": - return redirect("/exam/manage/designquestionpaper/" + questionpaper_id) + return my_redirect("/exam/manage/designquestionpaper/" + questionpaper_id) if request.method=="POST" and request.POST.get('delete') == "delete": data = request.POST.getlist('papers') @@ -334,16 +348,16 @@ def show_all_questionpapers(request,questionpaper_id=None): q_paper = QuestionPaper.objects.get(id=i).delete() question_paper= QuestionPaper.objects.all() context = {'papers': question_paper, } - return render_to_response('exam/showquestionpapers.html', context, + return my_render_to_response('exam/showquestionpapers.html', context, context_instance=RequestContext(request)) qu_papers = QuestionPaper.objects.all() context = {'papers':qu_papers} - return render_to_response('exam/showquestionpapers.html',context,context_instance=RequestContext(request)) + return my_render_to_response('exam/showquestionpapers.html',context,context_instance=RequestContext(request)) if questionpaper_id == None: qu_papers = QuestionPaper.objects.all() context = {'papers':qu_papers} - return render_to_response('exam/showquestionpapers.html',context,context_instance=RequestContext(request)) + return my_render_to_response('exam/showquestionpapers.html',context,context_instance=RequestContext(request)) else: qu_papers = QuestionPaper.objects.get(id=questionpaper_id) quiz = qu_papers.quiz @@ -352,7 +366,7 @@ def show_all_questionpapers(request,questionpaper_id=None): for i in questions: q.append(i) context = {'papers':{'quiz':quiz,'questions':q}} - return render_to_response('exam/editquestionpaper.html',context,context_instance=RequestContext(request)) + return my_render_to_response('exam/editquestionpaper.html',context,context_instance=RequestContext(request)) def automatic_questionpaper(request,questionpaper_id=None): @@ -373,7 +387,7 @@ def automatic_questionpaper(request,questionpaper_id=None): for i in set2: q = Question.objects.get(summary=i) quest_paper.questions.add(q) - return redirect('/exam/manage/showquiz') + return my_redirect('/exam/manage/showquiz') else: set1 = set() set2 = set() @@ -408,11 +422,11 @@ def automatic_questionpaper(request,questionpaper_id=None): msg = 'The given Criteria does not satisfy the number of Questions...' tags = Tag.objects.all() context = {'data':{'questions':set2,'tags':tags,'msg':msg}} - return render_to_response('exam/automatic_questionpaper.html',context,context_instance=RequestContext(request)) + return my_render_to_response('exam/automatic_questionpaper.html',context,context_instance=RequestContext(request)) else: tags = Tag.objects.all() context = {'data':{'tags':tags}} - return render_to_response('exam/automatic_questionpaper.html',context,context_instance=RequestContext(request)) + return my_render_to_response('exam/automatic_questionpaper.html',context,context_instance=RequestContext(request)) else: if request.method=="POST": @@ -422,7 +436,7 @@ def automatic_questionpaper(request,questionpaper_id=None): print str(i.id) + " " + i.summary q = Question.objects.get(summary=i) quest_paper.questions.add(q) - return redirect('/exam/manage/showquiz') + return my_redirect('/exam/manage/showquiz') else: set1 = set() set2 = set() @@ -457,11 +471,11 @@ def automatic_questionpaper(request,questionpaper_id=None): msg = 'The given Criteria does not satisfy the number of Questions...' tags = Tag.objects.all() context = {'data':{'questions':set2,'tags':tags,'msg':msg}} - return render_to_response('exam/automatic_questionpaper.html',context,context_instance=RequestContext(request)) + return my_render_to_response('exam/automatic_questionpaper.html',context,context_instance=RequestContext(request)) else: tags = Tag.objects.all() context = {'data':{'tags':tags}} - return render_to_response('exam/automatic_questionpaper.html',context,context_instance=RequestContext(request)) + return my_render_to_response('exam/automatic_questionpaper.html',context,context_instance=RequestContext(request)) def manual_questionpaper(request,questionpaper_id=None): user=request.user @@ -481,7 +495,7 @@ def manual_questionpaper(request,questionpaper_id=None): for i in questions: q = Question.objects.get(id=i) quest_paper.questions.add(q) - return redirect('/exam/manage/showquiz') + return my_redirect('/exam/manage/showquiz') else: set1 = set() set2 = set() @@ -511,11 +525,11 @@ def manual_questionpaper(request,questionpaper_id=None): msg = 'No matching Question found...' tags = Tag.objects.all() context = {'data':{'questions':set2,'tags':tags,'msg':msg}} - return render_to_response('exam/manual_questionpaper.html',context,context_instance=RequestContext(request)) + return my_render_to_response('exam/manual_questionpaper.html',context,context_instance=RequestContext(request)) else: tags = Tag.objects.all() context = {'data':{'tags':tags}} - return render_to_response('exam/manual_questionpaper.html',context,context_instance=RequestContext(request)) + return my_render_to_response('exam/manual_questionpaper.html',context,context_instance=RequestContext(request)) else: if request.method=="POST": @@ -525,7 +539,7 @@ def manual_questionpaper(request,questionpaper_id=None): for i in questions: q = Question.objects.get(id=i) quest_paper.questions.add(q) - return redirect('/exam/manage/showquiz') + return my_redirect('/exam/manage/showquiz') else: set1 = set() set2 = set() @@ -555,11 +569,11 @@ def manual_questionpaper(request,questionpaper_id=None): msg = 'No matching Question found...' tags = Tag.objects.all() context = {'data':{'questions':set2,'tags':tags,'msg':msg}} - return render_to_response('exam/manual_questionpaper.html',context,context_instance=RequestContext(request)) + return my_render_to_response('exam/manual_questionpaper.html',context,context_instance=RequestContext(request)) else: tags = Tag.objects.all() context = {'data':{'tags':tags}} - return render_to_response('exam/manual_questionpaper.html',context,context_instance=RequestContext(request)) + return my_render_to_response('exam/manual_questionpaper.html',context,context_instance=RequestContext(request)) @@ -570,8 +584,8 @@ def prof_manage(request): user = request.user if user.is_authenticated() and user.groups.filter(name='moderator').count() > 0: context = {'user':user} - return render_to_response('manage.html',context) - return redirect('/exam/login/') + return my_render_to_response('manage.html',context) + return my_redirect('/exam/login/') def user_login(request): """Take the credentials of the user and log the user in.""" @@ -579,8 +593,8 @@ def user_login(request): user = request.user if user.is_authenticated(): if user.groups.filter(name='moderator').count() > 0 : - return redirect('/exam/manage/') - return redirect("/exam/intro/") + return my_redirect('/exam/manage/') + return my_redirect("/exam/intro/") if request.method == "POST": form = UserLoginForm(request.POST) @@ -588,23 +602,23 @@ def user_login(request): user = form.cleaned_data login(request, user) if user.groups.filter(name='moderator').count() > 0 : - return redirect('/exam/manage/') - return redirect('/exam/login/') + return my_redirect('/exam/manage/') + return my_redirect('/exam/login/') else: context = {"form": form} - return render_to_response('exam/login.html', context, + return my_render_to_response('exam/login.html', context, context_instance=RequestContext(request)) else: form = UserLoginForm() context = {"form": form} - return render_to_response('exam/login.html', context, + return my_render_to_response('exam/login.html', context, context_instance=RequestContext(request)) def start(request,questionpaper_id=None): """Check the user cedentials and if any quiz is available, start the exam.""" user = request.user if questionpaper_id == None: - return redirect('/exam/quizzes/') + return my_redirect('/exam/quizzes/') try: # Right now the app is designed so there is only one active quiz # at a particular time. @@ -645,7 +659,7 @@ def start(request,questionpaper_id=None): # Show the user the intro page. context = {'user': user,'paper_id':questionpaper_id} ci = RequestContext(request) - return render_to_response('exam/intro.html', context, + return my_render_to_response('exam/intro.html', context, context_instance=ci) def question(request, q_id, questionpaper_id): @@ -653,13 +667,13 @@ def question(request, q_id, questionpaper_id): user = request.user if not user.is_authenticated(): - return redirect('/exam/login/') + return my_redirect('/exam/login/') q = get_object_or_404(Question, pk=q_id) try: q_paper = QuestionPaper.objects.get(id=questionpaper_id) paper = AnswerPaper.objects.get(user=request.user, question_paper=q_paper) except AnswerPaper.DoesNotExist: - return redirect('/exam/start/') + return my_redirect('/exam/start/') if not paper.question_paper.quiz.active: return complete(request, reason='The quiz has been deactivated!') @@ -671,7 +685,7 @@ def question(request, q_id, questionpaper_id): 'quiz_name': quiz_name, 'time_left': time_left} ci = RequestContext(request) - return render_to_response('exam/question.html', context, + return my_render_to_response('exam/question.html', context, context_instance=ci) def show_question(request, q_id, questionpaper_id): @@ -687,7 +701,7 @@ def check(request, q_id, questionpaper_id=None): user = request.user if not user.is_authenticated(): - return redirect('/exam/login/') + return my_redirect('/exam/login/') question = get_object_or_404(Question, pk=q_id) q_paper = QuestionPaper.objects.get(id=questionpaper_id) paper = AnswerPaper.objects.get(user=request.user,question_paper = q_paper) @@ -739,7 +753,7 @@ def check(request, q_id, questionpaper_id=None): 'time_left': time_left} ci = RequestContext(request) - return render_to_response('exam/question.html', context, + return my_render_to_response('exam/question.html', context, context_instance=ci) else: next_q = paper.completed_question(question.id) @@ -748,7 +762,7 @@ def check(request, q_id, questionpaper_id=None): def quit(request, answerpaper_id=None): """Show the quit page when the user logs out.""" context = { 'id':answerpaper_id} - return render_to_response('exam/quit.html',context,context_instance=RequestContext(request)) + return my_render_to_response('exam/quit.html',context,context_instance=RequestContext(request)) def complete(request,reason = None,answerpaper_id=None): """Show a page to inform user that the quiz has been compeleted.""" @@ -758,7 +772,7 @@ def complete(request,reason = None,answerpaper_id=None): if answerpaper_id == None: logout(request) context = {'message': "You are successfully Logged out."} - return render_to_response('exam/complete.html', context) + return my_render_to_response('exam/complete.html', context) no = False message = reason or 'The quiz has been completed. Thank you.' if user.groups.filter(name='moderator').count() > 0: @@ -770,9 +784,9 @@ def complete(request,reason = None,answerpaper_id=None): answer_paper = AnswerPaper.objects.get(id=answerpaper_id) answer_paper.endtime = datetime.datetime.now() answer_paper.save() - return redirect('/exam/quizzes/') + return my_redirect('/exam/quizzes/') else: - return redirect('/exam/') + return my_redirect('/exam/') def monitor(request, quiz_id=None): """Monitor the progress of the papers taken so far.""" @@ -786,7 +800,7 @@ def monitor(request, quiz_id=None): context = {'papers': [], 'quiz': None, 'quizzes':q_paper} - return render_to_response('exam/monitor.html', context, + return my_render_to_response('exam/monitor.html', context, context_instance=RequestContext(request)) # quiz_id is not None. try: @@ -799,7 +813,7 @@ def monitor(request, quiz_id=None): total=Sum('answers__marks')).order_by('-total') context = {'papers': papers, 'quiz': quiz, 'quizzes': None} - return render_to_response('exam/monitor.html', context, + return my_render_to_response('exam/monitor.html', context, context_instance=RequestContext(request)) def get_user_data(username): @@ -829,7 +843,7 @@ def show_all_users(request): user = User.objects.filter(username__contains="") questionpaper = AnswerPaper.objects.all() context = { 'question': questionpaper } - return render_to_response('exam/showusers.html',context,context_instance=RequestContext(request)) + return my_render_to_response('exam/showusers.html',context,context_instance=RequestContext(request)) def show_all_quiz(request): """Generates a list of all the quizzes that are currently in the database.""" @@ -846,7 +860,7 @@ def show_all_quiz(request): context = {'papers': [], 'quiz': None, 'quizzes':quizzes} - return render_to_response('exam/show_quiz.html', context, + return my_render_to_response('exam/show_quiz.html', context, context_instance=RequestContext(request)) else: for i in data: @@ -855,7 +869,7 @@ def show_all_quiz(request): context = {'papers': [], 'quiz': None, 'quizzes':quizzes} - return render_to_response('exam/show_quiz.html', context, + return my_render_to_response('exam/show_quiz.html', context, context_instance=RequestContext(request)) elif request.method == 'POST' and request.POST.get('edit')=='edit': @@ -877,7 +891,7 @@ def show_all_quiz(request): initial_tags = "" form.initial['tags']=initial_tags forms.append(form) - return render_to_response('exam/edit_quiz.html',{'forms':forms,'data':data}, + return my_render_to_response('exam/edit_quiz.html',{'forms':forms,'data':data}, context_instance=RequestContext(request)) else: @@ -885,7 +899,7 @@ def show_all_quiz(request): context = {'papers': [], 'quiz': None, 'quizzes':quizzes} - return render_to_response('exam/show_quiz.html', context, + return my_render_to_response('exam/show_quiz.html', context, context_instance=RequestContext(request)) @@ -903,7 +917,7 @@ def show_all_questions(request): context = {'papers': [], 'question': None, 'questions':questions} - return render_to_response('exam/showquestions.html', context, + return my_render_to_response('exam/showquestions.html', context, context_instance=RequestContext(request)) else: for i in data: @@ -912,7 +926,7 @@ def show_all_questions(request): context = {'papers': [], 'question': None, 'questions':questions} - return render_to_response('exam/showquestions.html', context, + return my_render_to_response('exam/showquestions.html', context, context_instance=RequestContext(request)) elif request.method == 'POST' and request.POST.get('edit')=='edit': @@ -938,14 +952,14 @@ def show_all_questions(request): initial_tags = "" form.initial['tags']=initial_tags forms.append(form) - return render_to_response('exam/edit_question.html',{'forms':forms,'data':data},context_instance=RequestContext(request)) + return my_render_to_response('exam/edit_question.html',{'forms':forms,'data':data},context_instance=RequestContext(request)) else: questions = Question.objects.all() context = {'papers': [], 'question': None, 'questions':questions} - return render_to_response('exam/showquestions.html', context, + return my_render_to_response('exam/showquestions.html', context, context_instance=RequestContext(request)) def user_data(request, username): @@ -958,7 +972,7 @@ def user_data(request, username): data = get_user_data(username) context = {'data': data} - return render_to_response('exam/user_data.html', context, + return my_render_to_response('exam/user_data.html', context, context_instance=RequestContext(request)) def grade_user(request, username): @@ -982,9 +996,9 @@ def grade_user(request, username): paper.save() context = {'data': data} - return render_to_response('exam/user_data.html', context, + return my_render_to_response('exam/user_data.html', context, context_instance=RequestContext(request)) else: context = {'data': data} - return render_to_response('exam/grade_user.html', context, + return my_render_to_response('exam/grade_user.html', context, context_instance=RequestContext(request)) -- cgit From 370440db8a77969b7cd9c4a5803e6527841b55e4 Mon Sep 17 00:00:00 2001 From: jayparikh111 Date: Thu, 8 Nov 2012 12:34:14 +0530 Subject: removed global set varible --- testapp/exam/views.py | 44 +++++++++------------- .../templates/exam/automatic_questionpaper.html | 1 + testapp/templates/exam/editquestionpaper.html | 2 +- 3 files changed, 19 insertions(+), 28 deletions(-) diff --git a/testapp/exam/views.py b/testapp/exam/views.py index 9ec4ad4..49f7bb9 100644 --- a/testapp/exam/views.py +++ b/testapp/exam/views.py @@ -21,8 +21,6 @@ from settings import URL_ROOT # The directory where user data can be saved. OUTPUT_DIR = abspath(join(dirname(__file__), pardir, 'output')) -set1 = set() -set2 = set() def my_redirect(url): """An overridden redirect to deal with URL_ROOT-ing. See settings.py @@ -344,16 +342,13 @@ def show_all_questionpapers(request,questionpaper_id=None): if request.method=="POST" and request.POST.get('delete') == "delete": data = request.POST.getlist('papers') + q_paper = QuestionPaper.objects.get(id=questionpaper_id) for i in data: - q_paper = QuestionPaper.objects.get(id=i).delete() + q_paper.questions.remove(Question.objects.get(id=i)) question_paper= QuestionPaper.objects.all() - context = {'papers': question_paper, } + context = {'papers': question_paper } return my_render_to_response('exam/showquestionpapers.html', context, context_instance=RequestContext(request)) - qu_papers = QuestionPaper.objects.all() - context = {'papers':qu_papers} - return my_render_to_response('exam/showquestionpapers.html',context,context_instance=RequestContext(request)) - if questionpaper_id == None: qu_papers = QuestionPaper.objects.all() context = {'papers':qu_papers} @@ -372,8 +367,8 @@ def show_all_questionpapers(request,questionpaper_id=None): def automatic_questionpaper(request,questionpaper_id=None): user=request.user - global set1 - global set2 + set1 = set() + set2 = set() if not user.is_authenticated() or user.groups.filter(name='moderator').count() == 0 : raise Http404('You are not allowed to view this page!') @@ -384,13 +379,13 @@ def automatic_questionpaper(request,questionpaper_id=None): quest_paper = QuestionPaper() quest_paper.quiz = quiz quest_paper.save() - for i in set2: - q = Question.objects.get(summary=i) - quest_paper.questions.add(q) + questions = request.POST.getlist('questions') + for i in questions: + if i.isdigit(): + q = Question.objects.get(id=i) + quest_paper.questions.add(q) return my_redirect('/exam/manage/showquiz') else: - set1 = set() - set2 = set() no_questions = int(request.POST.get('questions')) first_tag = request.POST.get('first_tag') first_condition = request.POST.get('first_condition') @@ -432,14 +427,13 @@ def automatic_questionpaper(request,questionpaper_id=None): if request.method=="POST": if request.POST.get('save') == 'save' : quest_paper = QuestionPaper.objects.get(id=questionpaper_id) - for i in set2: - print str(i.id) + " " + i.summary - q = Question.objects.get(summary=i) - quest_paper.questions.add(q) + questions = request.POST.getlist('questions') + for i in questions: + if i.isdigit(): + q = Question.objects.get(id=i) + quest_paper.questions.add(q) return my_redirect('/exam/manage/showquiz') else: - set1 = set() - set2 = set() no_questions = int(request.POST.get('questions')) first_tag = request.POST.get('first_tag') first_condition = request.POST.get('first_condition') @@ -479,8 +473,8 @@ def automatic_questionpaper(request,questionpaper_id=None): def manual_questionpaper(request,questionpaper_id=None): user=request.user - global set1 - global set2 + set1 = set() + set2 = set() if not user.is_authenticated() or user.groups.filter(name='moderator').count() == 0 : raise Http404('You are not allowed to view this page!') @@ -497,8 +491,6 @@ def manual_questionpaper(request,questionpaper_id=None): quest_paper.questions.add(q) return my_redirect('/exam/manage/showquiz') else: - set1 = set() - set2 = set() first_tag = request.POST.get('first_tag') first_condition = request.POST.get('first_condition') second_tag = request.POST.get('second_tag') @@ -541,8 +533,6 @@ def manual_questionpaper(request,questionpaper_id=None): quest_paper.questions.add(q) return my_redirect('/exam/manage/showquiz') else: - set1 = set() - set2 = set() first_tag = request.POST.get('first_tag') first_condition = request.POST.get('first_condition') second_tag = request.POST.get('second_tag') diff --git a/testapp/templates/exam/automatic_questionpaper.html b/testapp/templates/exam/automatic_questionpaper.html index b8f76b4..7a70748 100644 --- a/testapp/templates/exam/automatic_questionpaper.html +++ b/testapp/templates/exam/automatic_questionpaper.html @@ -86,6 +86,7 @@ function load_data() Points Tags {% for question in data.questions %} + {{ question.summary }} {{ question.type }} {{ question.points }} {% for tag in question.tags.all %} {{ tag }} diff --git a/testapp/templates/exam/editquestionpaper.html b/testapp/templates/exam/editquestionpaper.html index 68a9c22..ee36cc8 100644 --- a/testapp/templates/exam/editquestionpaper.html +++ b/testapp/templates/exam/editquestionpaper.html @@ -12,7 +12,7 @@ {% csrf_token %} {% for i in papers.questions %} -  {{ i.summary}}
+  {{ i.summary}}
{% endfor %}
   -- cgit From 65d4498ff96090fecc569440f0cd1499ae0f6b69 Mon Sep 17 00:00:00 2001 From: jayparikh111 Date: Mon, 12 Nov 2012 14:21:19 +0530 Subject: change setting for URLs --- testapp/settings.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testapp/settings.py b/testapp/settings.py index a95706a..cb3defc 100644 --- a/testapp/settings.py +++ b/testapp/settings.py @@ -21,7 +21,7 @@ SERVER_TIMEOUT = 2 # are not hosted as host.org/exam/ but as host.org/foo/exam/ for whatever # reason set this to the root you have to serve at. In the above example # host.org/foo/exam set URL_ROOT='/foo' -URL_ROOT = '' +URL_ROOT = '/online_test' ADMINS = ( @@ -89,7 +89,7 @@ STATIC_URL = '/static/' # URL prefix for admin static files -- CSS, JavaScript and images. # Make sure to use a trailing slash. # Examples: "http://foo.com/static/admin/", "/static/admin/". -ADMIN_MEDIA_PREFIX = URL_ROOT + '/static/admin/' +ADMIN_MEDIA_PREFIX = '/static/admin/' # Additional locations of static files STATICFILES_DIRS = ( -- cgit From c12f20984aa75751af89a0d6213bc35924bc593b Mon Sep 17 00:00:00 2001 From: Jay Parikh Date: Mon, 18 Mar 2013 15:11:15 +0530 Subject: Added code snippets for questions --- testapp/exam/forms.py | 1 + testapp/exam/models.py | 3 +++ testapp/exam/views.py | 4 ++++ testapp/settings.py | 2 +- testapp/templates/exam/add_question.html | 1 + testapp/templates/exam/edit_question.html | 1 + testapp/templates/exam/question.html | 2 +- 7 files changed, 12 insertions(+), 2 deletions(-) diff --git a/testapp/exam/forms.py b/testapp/exam/forms.py index f48a674..9bcd04f 100644 --- a/testapp/exam/forms.py +++ b/testapp/exam/forms.py @@ -133,6 +133,7 @@ class QuestionForm(forms.Form): type = forms.CharField(max_length=8, widget=forms.Select(choices=QUESTION_TYPE_CHOICES)) active = forms.BooleanField(required=False) tags = TagField(widget=TagAutocomplete(),required=False) + snippet = forms.CharField(widget = forms.Textarea(attrs={'cols': 40, 'rows': 1}),required=False) def save(self): summary = self.cleaned_data["summary"] diff --git a/testapp/exam/models.py b/testapp/exam/models.py index 04789da..708c7af 100644 --- a/testapp/exam/models.py +++ b/testapp/exam/models.py @@ -44,6 +44,9 @@ class Question(models.Model): # Is this question active or not. If it is inactive it will not be used # when creating a QuestionPaper. active = models.BooleanField(default=True) + + #Code Snippet + snippet = models.CharField(max_length=256) #Tags for the Question. tags = TaggableManager() diff --git a/testapp/exam/views.py b/testapp/exam/views.py index 49f7bb9..a1e8ece 100644 --- a/testapp/exam/views.py +++ b/testapp/exam/views.py @@ -169,6 +169,7 @@ def edit_question(request): options = request.POST.getlist('options') type = request.POST.getlist('type') active = request.POST.getlist('active') + snippet = request.POST.getlist('snippet') tags = request.POST.getlist('tags') j = 0 for id_list in questions: @@ -181,6 +182,7 @@ def edit_question(request): question.type = type[j] edit_tags=tags[j] question.active = active[j] + question.snippet = snippet[j] question.save() for tag in question.tags.all(): question.tags.remove(tag) @@ -219,6 +221,7 @@ def add_question(request,question_id=None): d.options = form['options'].data d.type = form['type'].data d.active = form['active'].data + d.snippet = form['snippet'].data d.save() question = Question.objects.get(id=question_id) for tag in question.tags.all(): @@ -250,6 +253,7 @@ def add_question(request,question_id=None): form.initial['options'] = d.options form.initial['type'] = d.type form.initial['active'] = d.active + form.initial['snippet'] = d.snippet form_tags = d.tags.all() form_tags_split = form_tags.values('name') initial_tags = "" diff --git a/testapp/settings.py b/testapp/settings.py index cb3defc..10d0919 100644 --- a/testapp/settings.py +++ b/testapp/settings.py @@ -21,7 +21,7 @@ SERVER_TIMEOUT = 2 # are not hosted as host.org/exam/ but as host.org/foo/exam/ for whatever # reason set this to the root you have to serve at. In the above example # host.org/foo/exam set URL_ROOT='/foo' -URL_ROOT = '/online_test' +URL_ROOT = '' ADMINS = ( diff --git a/testapp/templates/exam/add_question.html b/testapp/templates/exam/add_question.html index 9651600..e3ba17a 100644 --- a/testapp/templates/exam/add_question.html +++ b/testapp/templates/exam/add_question.html @@ -26,6 +26,7 @@ Rendered:
Description: {{ form.description}} {{form.description.errors}} Test: {{ form.test }}{{form.test.errors}} + Snippet: {{ form.snippet }}{{ form.snippet.errors }} Tags: {{ form.tags }} Options: {{ form.options }} {{form.options.errors}} diff --git a/testapp/templates/exam/edit_question.html b/testapp/templates/exam/edit_question.html index 0a41326..96502f1 100644 --- a/testapp/templates/exam/edit_question.html +++ b/testapp/templates/exam/edit_question.html @@ -36,6 +36,7 @@ Rendered:
Description: {{ form.description }} {{form.description.errors}} Test: {{ form.test }}{{form.test.errors}} + Snippet: {{ form.snippet }}{{ form.snippet.errors }} Tags: {{ form.tags }} Options: {{ form.options }} {{form.options.errors}} {{form.options.helptext}} diff --git a/testapp/templates/exam/question.html b/testapp/templates/exam/question.html index b2f5816..aaf7270 100644 --- a/testapp/templates/exam/question.html +++ b/testapp/templates/exam/question.html @@ -208,7 +208,7 @@ function catchTab(item,e){ {% endfor %} {% else %} - {% if last_attempt %}{{last_attempt.strip}}{% else %}{% if question.type == "bash" %} #!/bin/bash{% else %}# Enter your answer here.{% endif %}{% endif %} + {% if last_attempt %}{{last_attempt.strip}}{% else %}{% if question.type == "bash" %} #!/bin/bash{% else %}{{ question.snippet }}{% endif %}{% endif %}
- - - - + {% endblock script %} -{% block onload %} onload="update_time()" {% endblock onload %} + +{% block onload %} onload="update_time()" {% endblock %} {% block pagetitle %} @@ -178,6 +28,7 @@ function catchTab(item,e){ {% endblock %} {% block content %} +

-- cgit From c8b68813ca80aee16261e5f02d541ed48712feae Mon Sep 17 00:00:00 2001 From: Hardik Ghaghada Date: Fri, 26 Apr 2013 16:40:34 +0530 Subject: Dumped JS from HTML pages to separate JS files --- testapp/static/exam/js/add_questionpaper.js | 25 ++++++++++++++++++ testapp/static/exam/js/add_quiz.js | 8 ++++++ testapp/static/exam/js/edit_question.js | 13 ++++++++++ testapp/static/exam/js/question.js | 27 ------------------- testapp/templates/exam/add_questionpaper.html | 30 ++-------------------- testapp/templates/exam/add_quiz.html | 12 +-------- .../templates/exam/automatic_questionpaper.html | 18 ++----------- testapp/templates/exam/grade_user.html | 17 ++---------- testapp/templates/exam/manual_questionpaper.html | 16 ++---------- testapp/templates/exam/question.html | 30 +++++++++++++++++++++- 10 files changed, 84 insertions(+), 112 deletions(-) create mode 100644 testapp/static/exam/js/add_questionpaper.js create mode 100644 testapp/static/exam/js/add_quiz.js diff --git a/testapp/static/exam/js/add_questionpaper.js b/testapp/static/exam/js/add_questionpaper.js new file mode 100644 index 0000000..6185dd5 --- /dev/null +++ b/testapp/static/exam/js/add_questionpaper.js @@ -0,0 +1,25 @@ +function load_data() +{ + var url_root = document.getElementById('url_root').value; + var value = document.getElementById('mode').value; + var pathArray = window.location.pathname.split( '/' ); + length = pathArray.length; + var digit = parseInt(pathArray[length-2]); + + if (! isNaN(digit) && value == 'Automatic') + { + window.location = url_root + "/exam/manage/designquestionpaper/automatic/" + digit; + } + else if(!isNaN(digit) && value == 'Manual') + { + window.location = url_root + "/exam/manage/designquestionpaper/manual/" + digit; + } + else if(value == 'Automatic') + { + window.location = window.location.pathname + "automatic"; + } + else if( value == 'Manual') + { + window.location = window.location.pathname + "manual"; + } +} diff --git a/testapp/static/exam/js/add_quiz.js b/testapp/static/exam/js/add_quiz.js new file mode 100644 index 0000000..56b0e95 --- /dev/null +++ b/testapp/static/exam/js/add_quiz.js @@ -0,0 +1,8 @@ +function test() +{ + if (document.getElementById("id_description").value != "") + { + alert("reached condition"); + document.getElementById("submit").innerHTML = "Save"; + } +} diff --git a/testapp/static/exam/js/edit_question.js b/testapp/static/exam/js/edit_question.js index 69e0d97..acba384 100644 --- a/testapp/static/exam/js/edit_question.js +++ b/testapp/static/exam/js/edit_question.js @@ -33,6 +33,19 @@ function decrease(frm,n) } } +function grade_data(showHideDiv) +{ + var ele=document.getElementById(showHideDiv); + if (ele.style.display=="block") + { + ele.style.display = "none"; + } + else + { + ele.style.display = "block"; + } +} + function data(showContent,showHideDiv,a,summary) { diff --git a/testapp/static/exam/js/question.js b/testapp/static/exam/js/question.js index 3078c64..ba3f6d2 100644 --- a/testapp/static/exam/js/question.js +++ b/testapp/static/exam/js/question.js @@ -8,33 +8,6 @@ function submitCode() x.value = "Checking Answer ..."; document.getElementById("skip").disabled = true; } - -function secs_to_time(secs) -{ - var h = Math.floor(secs/3600); - var h_s = (h > 0) ? h+'h:' : ''; - var m = Math.floor((secs%3600)/60); - var m_s = (m > 0) ? m+'m:' : ''; - var s_s = Math.floor(secs%60) + 's'; - return h_s + m_s + s_s; -} - -function update_time() -{ - var time_left = document.getElementById("time").value; - time_left -= 1; - if (time_left) - { - var elem = document.getElementById("time_left"); - var t_str = secs_to_time(time_left); - elem.innerHTML = "" + t_str + ""; - setTimeout("update_time()", 1000); - } - else - { - document.forms["code"].submit(); - } -} function setSelectionRange(input, selectionStart, selectionEnd) { diff --git a/testapp/templates/exam/add_questionpaper.html b/testapp/templates/exam/add_questionpaper.html index 664093c..4cce8a9 100644 --- a/testapp/templates/exam/add_questionpaper.html +++ b/testapp/templates/exam/add_questionpaper.html @@ -10,36 +10,11 @@ {% block script %} - - + {% endblock %} {% block manage %} +
{% csrf_token %} Select mode to design Question Paper: @@ -50,5 +25,4 @@ Select mode to design Question Paper:
- {% endblock %} diff --git a/testapp/templates/exam/add_quiz.html b/testapp/templates/exam/add_quiz.html index 2667c0c..9851584 100644 --- a/testapp/templates/exam/add_quiz.html +++ b/testapp/templates/exam/add_quiz.html @@ -10,17 +10,7 @@ {% block script %} - + {% endblock %} {% block onload %} onload="javascript:test();" {% endblock %} {% block manage %} diff --git a/testapp/templates/exam/automatic_questionpaper.html b/testapp/templates/exam/automatic_questionpaper.html index 7a70748..1175f55 100644 --- a/testapp/templates/exam/automatic_questionpaper.html +++ b/testapp/templates/exam/automatic_questionpaper.html @@ -16,26 +16,12 @@ select {% block script %} - - + {% endblock %} {% block manage %} + Automatic mode to design the Question Paper
-
{% csrf_token %} diff --git a/testapp/templates/exam/grade_user.html b/testapp/templates/exam/grade_user.html index 58e118b..ae9274e 100644 --- a/testapp/templates/exam/grade_user.html +++ b/testapp/templates/exam/grade_user.html @@ -9,20 +9,7 @@ {% endblock %} {% block script %} - + {% endblock %} {% block manage %} @@ -59,7 +46,7 @@ Start time: {{ paper.start_time }}

Question: {{ question.id }}. {{ question.summary }} (Points: {{ question.points }}) -Details
+Details

Description : {{ question.description }}
diff --git a/testapp/templates/exam/manual_questionpaper.html b/testapp/templates/exam/manual_questionpaper.html index 47df1ed..1a1f95c 100644 --- a/testapp/templates/exam/manual_questionpaper.html +++ b/testapp/templates/exam/manual_questionpaper.html @@ -17,23 +17,11 @@ select - + {% endblock %} {% block manage %} + Manual mode to design the Question Paper
diff --git a/testapp/templates/exam/question.html b/testapp/templates/exam/question.html index c74564c..8cd2599 100644 --- a/testapp/templates/exam/question.html +++ b/testapp/templates/exam/question.html @@ -11,6 +11,35 @@ {% block script %} + + {% endblock script %} @@ -28,7 +57,6 @@ {% endblock %} {% block content %} -

-- cgit From 92852b6f04e82abbe8eea9d296b5bbc5a15399cf Mon Sep 17 00:00:00 2001 From: Hardik Ghaghada Date: Fri, 26 Apr 2013 16:46:06 +0530 Subject: missed this file in the previous commit --- testapp/templates/exam/question.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testapp/templates/exam/question.html b/testapp/templates/exam/question.html index 8cd2599..4f65b64 100644 --- a/testapp/templates/exam/question.html +++ b/testapp/templates/exam/question.html @@ -13,7 +13,7 @@

Start Date	Duration	Active	Description +
{{ form.start_date}}	{{ form.duration }}	{{ form.active }}	{{ form.description }} +

Online Test

Login

New User Registration

Please fill in the following details

{{ question.summary }}

Online Test

{{ question.summary }}

{{ question.description|safe }}

(Marks : {{ question.points }})

ERROR:

{{ user.first_name.title }} {{ user.last_name.title }}, You have {{ paper.questions_left }} question(s) left in {{ quiz_name }}

Good bye!

Online Test

Good bye!

{{message}}

You may now close the browser.

Online Test

Your current answers are saved.

Are you sure you wish to quit the exam?

Important rules and instructions

Online Test

Important instructions & rules

Online Test

Grading papers for {{ data.user.get_full_name.title }}

Grading papers for {{ data.user.get_full_name.title }}

Answers

Answers

Teacher comments:

Online Test

Data for user {{ data.user.get_full_name.title }}

Data for user {{ data.user.get_full_name.title }}

Quiz results

Quiz results

No quizzes available.

Available quizzes

Available quizzes

{{ quiz.description }} results

{{ quiz.description }} results

Online Test

Your current answers are saved.

Are you sure you wish to quit the exam?

Online Test

Your current answers are saved.

Are you sure you wish to quit the exam?

Online Test

Online Test

Test for {{ user.first_name.title }} {{ user.last_name.title }}

{{ question.summary }}

{{ question.description|safe }}

Online Test

Grading papers for {{ data.user.get_full_name.title }}

Quiz results

No quizzes available.

Available quizzes

{{ quiz.description }} results

Manage

Online Test

{% block subtitle %} {% endblock %}

Manage

Manage

{% block subtitle %} {% endblock %}

Manage

Manage

Answers

Manage

Available Quiz

No quizzes available.

List of Quizzes

Manage

Available Quiz

Available Quiz

No quizzes available.

List of Quizzes

Quiz List

Quiz List

Online Test

{% block subtitle %} {% endblock %}

Online Test

Data for user {{ data.user.get_full_name.title }}

Online Test

{{ error_message }}
{% endif %}

@@ -93,11 +88,5 @@