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 %}
+
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 !!!
-
-
-
-
-
-
-
-
-
+
+
+
+
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.
+
-
-
{% 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 %}