summaryrefslogtreecommitdiff
path: root/testapp/exam
diff options
context:
space:
mode:
Diffstat (limited to 'testapp/exam')
-rw-r--r--testapp/exam/admin.py2
-rw-r--r--testapp/exam/forms.py2
-rw-r--r--testapp/exam/models.py2
-rw-r--r--testapp/exam/templates/exam/design_questionpaper.html2
-rw-r--r--testapp/exam/urls.py2
-rw-r--r--testapp/exam/views.py8
6 files changed, 9 insertions, 9 deletions
diff --git a/testapp/exam/admin.py b/testapp/exam/admin.py
index 8482ef9..060859a 100644
--- a/testapp/exam/admin.py
+++ b/testapp/exam/admin.py
@@ -1,4 +1,4 @@
-from exam.models import Question, Quiz
+from testapp.exam.models import Question, Quiz
from django.contrib import admin
admin.site.register(Question)
diff --git a/testapp/exam/forms.py b/testapp/exam/forms.py
index 9bfedbe..f04fdb3 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, Question
+from testapp.exam.models import Profile, Quiz, Question
from django.contrib.auth import authenticate
from django.contrib.auth.models import User
diff --git a/testapp/exam/models.py b/testapp/exam/models.py
index 4d82783..196ee73 100644
--- a/testapp/exam/models.py
+++ b/testapp/exam/models.py
@@ -304,7 +304,7 @@ class AnswerPaper(models.Model):
def time_left(self):
"""Return the time remaining for the user in seconds."""
- dt = datetime.datetime.now() - self.start_time
+ dt = datetime.datetime.now() - self.start_time.replace(tzinfo=None)
try:
secs = dt.total_seconds()
except AttributeError:
diff --git a/testapp/exam/templates/exam/design_questionpaper.html b/testapp/exam/templates/exam/design_questionpaper.html
index 8994148..33c8b8f 100644
--- a/testapp/exam/templates/exam/design_questionpaper.html
+++ b/testapp/exam/templates/exam/design_questionpaper.html
@@ -165,7 +165,7 @@ select
<div class="modal-header">
<h4 class="modal-title" id="myModalLabel">Cannot Save</h4>
</div>
- <div id = "modal_body"class="modal-body">
+ <div class="modal-body">
Please select questions for your paper
</div>
<div class="modal-footer">
diff --git a/testapp/exam/urls.py b/testapp/exam/urls.py
index 37a031d..f8a6cb8 100644
--- a/testapp/exam/urls.py
+++ b/testapp/exam/urls.py
@@ -1,6 +1,6 @@
from django.conf.urls import patterns, include, url
-urlpatterns = patterns('exam.views',
+urlpatterns = patterns('testapp.exam.views',
url(r'^$', 'index'),
url(r'^login/$', 'user_login'),
url(r'^quizzes/$','quizlist_user'),
diff --git a/testapp/exam/views.py b/testapp/exam/views.py
index 7c9af6c..60dc01d 100644
--- a/testapp/exam/views.py
+++ b/testapp/exam/views.py
@@ -15,11 +15,11 @@ from django.views.decorators.csrf import csrf_exempt
from taggit.models import Tag
from itertools import chain
# Local imports.
-from exam.models import Quiz, Question, QuestionPaper, QuestionSet
-from exam.models import Profile, Answer, AnswerPaper, User
-from exam.forms import UserRegisterForm, UserLoginForm, QuizForm,\
+from testapp.exam.models import Quiz, Question, QuestionPaper, QuestionSet
+from testapp.exam.models import Profile, Answer, AnswerPaper, User
+from testapp.exam.forms import UserRegisterForm, UserLoginForm, QuizForm,\
QuestionForm, RandomQuestionForm
-from exam.xmlrpc_clients import code_server
+from testapp.exam.xmlrpc_clients import code_server
from settings import URL_ROOT
# The directory where user data can be saved.