summaryrefslogtreecommitdiff
path: root/testapp/exam/urls.py
diff options
context:
space:
mode:
Diffstat (limited to 'testapp/exam/urls.py')
-rw-r--r--testapp/exam/urls.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/testapp/exam/urls.py b/testapp/exam/urls.py
index f8a6cb8..f7a7c54 100644
--- a/testapp/exam/urls.py
+++ b/testapp/exam/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls import patterns, include, url
+from django.conf.urls import *
urlpatterns = patterns('testapp.exam.views',
url(r'^$', 'index'),
@@ -6,15 +6,16 @@ urlpatterns = patterns('testapp.exam.views',
url(r'^quizzes/$','quizlist_user'),
url(r'^results/$','results_user'),
url(r'^start/$', 'start'),
- url(r'^start/(?P<questionpaper_id>\d+)/$','start'),
- url(r'^quit/(?P<questionpaper_id>\d+)/$', 'quit'),
+ url(r'^start/(?P<attempt_no>\d+)/(?P<questionpaper_id>\d+)/$','start'),
+ url(r'^quit/(?P<attempt_no>\d+)/(?P<questionpaper_id>\d+)/$', 'quit'),
url(r'^intro/(?P<questionpaper_id>\d+)/$','intro'),
url(r'^complete/$', 'complete'),
- url(r'^complete/(?P<questionpaper_id>\d+)/$', 'complete'),
+ url(r'^complete/(?P<attempt_no>\d+)/(?P<questionpaper_id>\d+)/$', 'complete'),
+ url(r'^submit-assignment(?P<question_id>\d+)/$', 'submit_assignment'),
url(r'^register/$', 'user_register'),
url(r'^(?P<q_id>\d+)/$', 'question'),
url(r'^(?P<q_id>\d+)/check/$', 'check'),
- url(r'^(?P<q_id>\d+)/check/(?P<questionpaper_id>\d+)/$', 'check'),
+ url(r'^(?P<q_id>\d+)/check/(?P<attempt_no>\d+)/(?P<questionpaper_id>\d+)/$', 'check'),
url(r'^intro/$', 'start'),
url(r'^manage/$', 'prof_manage'),