From e3d289ca93047a1632a74ecfd5bc996433f3edb4 Mon Sep 17 00:00:00 2001
From: adityacp
Date: Tue, 4 Apr 2017 16:16:56 +0530
Subject: Change in views and urls - Change monitor and grade_user function in
 views - Change url to get quiz id instead of question paper id

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

(limited to 'yaksh/urls.py')

diff --git a/yaksh/urls.py b/yaksh/urls.py
index ad58985..9108b7b 100644
--- a/yaksh/urls.py
+++ b/yaksh/urls.py
@@ -40,7 +40,7 @@ urlpatterns = [
     url(r'^manage/showquestionpapers/$', views.show_all_questionpapers),
     url(r'^manage/showquestionpapers/(?P<questionpaper_id>\d+)/$',\
                                                     views.show_all_questionpapers),
-    url(r'^manage/monitor/(?P<questionpaper_id>\d+)/$', views.monitor),
+    url(r'^manage/monitor/(?P<quiz_id>\d+)/$', views.monitor),
     url(r'^manage/user_data/(?P<user_id>\d+)/(?P<questionpaper_id>\d+)/$',
         views.user_data),
     url(r'^manage/user_data/(?P<user_id>\d+)/$', views.user_data),
-- 
cgit 


From bd8c2c653a06e29dcf7a1a0103f7735f46f0c488 Mon Sep 17 00:00:00 2001
From: adityacp
Date: Fri, 31 Mar 2017 16:37:07 +0530
Subject: Change in templates and js and urls - Add urls to download quiz
 assignments in urls.p - Catch Http404 exception message in 404.html template
 - Add download assignment links for quiz in grade_user.html - Fix javascript
 validation in add_question.js

---
 yaksh/urls.py | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'yaksh/urls.py')

diff --git a/yaksh/urls.py b/yaksh/urls.py
index 00b34e4..445b828 100644
--- a/yaksh/urls.py
+++ b/yaksh/urls.py
@@ -91,4 +91,8 @@ urlpatterns = [
     url(r'^manage/create_demo_course/$', views.create_demo_course),
     url(r'^manage/courses/download_course_csv/(?P<course_id>\d+)/$',
         views.download_course_csv),
+    url(r'^manage/download/user_assignment/(?P<question_id>\d+)/(?P<user_id>\d+)/(?P<questionpaper_id>\d+)/$',
+        views.download_assignment_file),
+    url(r'^manage/download/quiz_assignments/(?P<questionpaper_id>\d+)/$',
+        views.download_assignment_file)
 ]
-- 
cgit 


From 5623c1225f66831d5e5db2089218b7904c3124b6 Mon Sep 17 00:00:00 2001
From: adityacp
Date: Mon, 10 Apr 2017 16:15:59 +0530
Subject: Change download assignemnts to get files using quiz

---
 yaksh/urls.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'yaksh/urls.py')

diff --git a/yaksh/urls.py b/yaksh/urls.py
index 445b828..4a96d08 100644
--- a/yaksh/urls.py
+++ b/yaksh/urls.py
@@ -91,8 +91,8 @@ urlpatterns = [
     url(r'^manage/create_demo_course/$', views.create_demo_course),
     url(r'^manage/courses/download_course_csv/(?P<course_id>\d+)/$',
         views.download_course_csv),
-    url(r'^manage/download/user_assignment/(?P<question_id>\d+)/(?P<user_id>\d+)/(?P<questionpaper_id>\d+)/$',
+    url(r'^manage/download/user_assignment/(?P<question_id>\d+)/(?P<user_id>\d+)/(?P<quiz_id>\d+)/$',
         views.download_assignment_file),
-    url(r'^manage/download/quiz_assignments/(?P<questionpaper_id>\d+)/$',
+    url(r'^manage/download/quiz_assignments/(?P<quiz_id>\d+)/$',
         views.download_assignment_file)
 ]
-- 
cgit 


From deaa592f01d5f270abca89c78620af1406fee67c Mon Sep 17 00:00:00 2001
From: adityacp
Date: Wed, 19 Apr 2017 12:54:41 +0530
Subject: Change urls, models, views - Add Assignment upload model manager -
 Change views to update marks for user if updated manually - Change variable
 names in views - Add url to provide assignment download for student

---
 yaksh/urls.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'yaksh/urls.py')

diff --git a/yaksh/urls.py b/yaksh/urls.py
index 4a96d08..5623eab 100644
--- a/yaksh/urls.py
+++ b/yaksh/urls.py
@@ -26,6 +26,8 @@ urlpatterns = [
     url(r'^enroll_request/(?P<course_id>\d+)/$', views.enroll_request, name='enroll_request'),
     url(r'^self_enroll/(?P<course_id>\d+)/$', views.self_enroll, name='self_enroll'),
     url(r'^view_answerpaper/(?P<questionpaper_id>\d+)/$', views.view_answerpaper, name='view_answerpaper'),
+    url(r'^download/user_assignment/(?P<question_id>\d+)/(?P<user_id>\d+)/(?P<quiz_id>\d+)$',
+        views.download_assignment_file, name="download_user_assignment"),
     url(r'^manage/$', views.prof_manage, name='manage'),
     url(r'^manage/addquestion/$', views.add_question),
     url(r'^manage/addquestion/(?P<question_id>\d+)/$', views.add_question),
-- 
cgit