From 0808861705c08aede6c0dc9e07ac891911a7bbfb Mon Sep 17 00:00:00 2001
From: prathamesh
Date: Tue, 23 Sep 2014 14:44:47 +0530
Subject: Models and views modified.

Added number of attempts option for quiz.
Also days lag between two attempts.
added test status and attempt number for the test.
Removed profile foreign key from answer paper models
since user foreign key is present in the answer paper model.
Urls slightly modified to include attemt number for a given quiz.
---
 testapp/exam/urls.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'testapp/exam/urls.py')

diff --git a/testapp/exam/urls.py b/testapp/exam/urls.py
index 37a031d..d553941 100644
--- a/testapp/exam/urls.py
+++ b/testapp/exam/urls.py
@@ -6,15 +6,15 @@ urlpatterns = patterns('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'^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'),
-- 
cgit 


From 534cc561e22da308e31282ab9c598041558aa1b4 Mon Sep 17 00:00:00 2001
From: hardythe1
Date: Wed, 14 Jan 2015 13:43:41 +0530
Subject: Added model to store assignment files

---
 testapp/exam/urls.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'testapp/exam/urls.py')

diff --git a/testapp/exam/urls.py b/testapp/exam/urls.py
index d71329c..6aa395c 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.defaults import *
 
 urlpatterns = patterns('testapp.exam.views',
     url(r'^$', 'index'),
-- 
cgit 


From cbdeb90a756832c71c80bac4dbe9ba1a3aceacb2 Mon Sep 17 00:00:00 2001
From: hardythe1
Date: Fri, 16 Jan 2015 16:47:43 +0530
Subject: added view, urls for assignment upload & changed the model

---
 testapp/exam/urls.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'testapp/exam/urls.py')

diff --git a/testapp/exam/urls.py b/testapp/exam/urls.py
index 6aa395c..e32b7e1 100644
--- a/testapp/exam/urls.py
+++ b/testapp/exam/urls.py
@@ -11,6 +11,7 @@ urlpatterns = patterns('testapp.exam.views',
     url(r'^intro/(?P<questionpaper_id>\d+)/$','intro'),
     url(r'^complete/$', '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'),
-- 
cgit 


From f2e09edeb2e5b884f0e75ad3747b51e7603d70e1 Mon Sep 17 00:00:00 2001
From: prathamesh
Date: Tue, 20 Jan 2015 17:05:41 +0530
Subject: Assignment upload interface implementation

---
 testapp/exam/urls.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'testapp/exam/urls.py')

diff --git a/testapp/exam/urls.py b/testapp/exam/urls.py
index e32b7e1..f7a7c54 100644
--- a/testapp/exam/urls.py
+++ b/testapp/exam/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls import *
 
 urlpatterns = patterns('testapp.exam.views',
     url(r'^$', 'index'),
-- 
cgit 


From caf153bcaa8b9a0096a4653b562198f2ba2cef9a Mon Sep 17 00:00:00 2001
From: prathamesh
Date: Tue, 24 Feb 2015 09:29:35 +0530
Subject: Question navigator implemented

Students can now move from one question to another through
the navigator window.
Also, the questions attempted will have different color then
the ones which are not attempted.
---
 testapp/exam/urls.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'testapp/exam/urls.py')

diff --git a/testapp/exam/urls.py b/testapp/exam/urls.py
index f7a7c54..62fa9e1 100644
--- a/testapp/exam/urls.py
+++ b/testapp/exam/urls.py
@@ -17,6 +17,7 @@ urlpatterns = patterns('testapp.exam.views',
     url(r'^(?P<q_id>\d+)/check/$', 'check'),
     url(r'^(?P<q_id>\d+)/check/(?P<attempt_no>\d+)/(?P<questionpaper_id>\d+)/$', 'check'),
     url(r'^intro/$', 'start'),
+    url(r'^(?P<q_id>\d+)/(?P<attempt_no>\d+)/(?P<questionpaper_id>\d+)/$', 'show_question'),
 
     url(r'^manage/$', 'prof_manage'),
     url(r'^manage/addquestion/$', 'add_question'),
-- 
cgit