Merge branch 'model_changes' of ...

https://github.com/hardythe1/online_test into master.

Conflicts:
	production.cfg
	testapp/production.py

1 files changed, 37 insertions, 7 deletions

diff --git a/testapp/exam/urls.py b/testapp/exam/urls.py
index 34e329f..b3cfceb 100644
--- a/testapp/exam/urls.py
+++ b/testapp/exam/urls.py
@@ -3,14 +3,44 @@ from django.conf.urls.defaults import patterns, include, url
 urlpatterns = patterns('exam.views',
     url(r'^$', 'index'),
     url(r'^login/$', 'user_login'),
-    url(r'^register/$', 'user_register'),
+    url(r'^quizzes/$','quizlist_user'),
+    url(r'^results/$','results_user'),
     url(r'^start/$', 'start'),
-    url(r'^quit/$', 'quit'),
-    url(r'^complete/$', 'complete'),
-    url(r'^monitor/$', 'monitor'),
-    url(r'^monitor/(?P<quiz_id>\d+)/$', 'monitor'),    
-    url(r'^user_data/(?P<username>[a-zA-Z0-9_.]+)/$', 'user_data'),
-    url(r'^grade_user/(?P<username>[a-zA-Z0-9_.]+)/$', 'grade_user'),
+    url(r'^start/(?P<questionpaper_id>\d+)/$','start'),
+    url(r'^quit/(?P<answerpaper_id>\d+)/$', 'quit'),
+    url(r'^intro/$','start'),
+    url(r'^complete/$', 'complete'),   
+    url(r'^complete/(?P<answerpaper_id>\d+)/$', 'complete'),
+    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'^manage/$', 'prof_manage'),
+    url(r'^manage/addquestion/$', 'add_question'),
+    url(r'^manage/addquestion/(?P<question_id>\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<quiz_id>\d+)/$', 'add_quiz'),
+    url(r'^manage/gradeuser/$', 'show_all_users'),
+    url(r'^manage/gradeuser/(?P<username>[a-zA-Z0-9_.]+)/$', 'grade_user'),
+    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<questionpaper_id>\d+)/$',\
+                                                    'show_all_questionpapers'),
+    url(r'^manage/monitor/(?P<quiz_id>\d+)/$', 'monitor'),    
+    url(r'^manage/user_data/(?P<username>[a-zA-Z0-9_.]+)/$','user_data'),
+    url(r'^manage/designquestionpaper/$','design_questionpaper'),
+    url(r'^manage/designquestionpaper/(?P<questionpaper_id>\d+)/$',\
+                                                        'design_questionpaper'),
+    url(r'^manage/designquestionpaper/automatic/(?P<questionpaper_id>\d+)/$',\
+                                                    'automatic_questionpaper'),
+    url(r'^manage/designquestionpaper/automatic$','automatic_questionpaper'),
+    url(r'^manage/designquestionpaper/manual$','manual_questionpaper'),
+    url(r'^manage/designquestionpaper/manual/(?P<questionpaper_id>\d+)/$',\
+                                                        'manual_questionpaper'),
 )