From 5a2ed309ff2f5f70571240b551978e25e51cd51f Mon Sep 17 00:00:00 2001 From: adityacp Date: Tue, 20 Feb 2018 11:43:50 +0530 Subject: Change in models.py, views.py and ursl.py - Change urls to take two types of course clone - Change view duplicate_course to copy or clone depending on type - Change view function prof_manage to avoid error while deleting trial answerpapers - Add new model methods for course, module, unit, lesson and quiz to create copies --- 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 08c2091..b1e6249 100644 --- a/yaksh/urls.py +++ b/yaksh/urls.py @@ -86,8 +86,8 @@ urlpatterns = [ views.show_statistics, name="show_statistics"), url(r'^manage/download_quiz_csv/(?P\d+)/(?P\d+)/$', views.download_quiz_csv, name="download_quiz_csv"), - url(r'^manage/duplicate_course/(?P\d+)/$', views.duplicate_course, - name='duplicate_course'), + url(r'^manage/duplicate_course/(?Pcopy|clone)/(?P\d+)/$', + views.duplicate_course, name='duplicate_course'), url(r'manage/courses/$', views.courses, name='courses'), url(r'manage/add_course/$', views.add_course, name='add_course'), url(r'manage/edit_course/(?P\d+)$', views.add_course, name='edit_course'), -- cgit From 333859a8c1ab57e70ea57e92a22eaac6a1a1c0ac Mon Sep 17 00:00:00 2001 From: adityacp Date: Thu, 22 Feb 2018 18:05:00 +0530 Subject: Change templates, test_views.py, urls.py, views.py - Change copy_type to shallow and deep --- 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 b1e6249..473a854 100644 --- a/yaksh/urls.py +++ b/yaksh/urls.py @@ -86,7 +86,7 @@ urlpatterns = [ views.show_statistics, name="show_statistics"), url(r'^manage/download_quiz_csv/(?P\d+)/(?P\d+)/$', views.download_quiz_csv, name="download_quiz_csv"), - url(r'^manage/duplicate_course/(?Pcopy|clone)/(?P\d+)/$', + url(r'^manage/duplicate_course/(?Pshallow|deep)/(?P\d+)/$', views.duplicate_course, name='duplicate_course'), url(r'manage/courses/$', views.courses, name='courses'), url(r'manage/add_course/$', views.add_course, name='add_course'), -- cgit From 0ae21e437775b056d346311bd9f50220e5d9fb28 Mon Sep 17 00:00:00 2001 From: adityacp Date: Tue, 27 Feb 2018 15:41:08 +0530 Subject: Change in models.py, views.py, urls.py, test_views.py, courses.html - Allow only deep cloning of a course - Remove tests for shallow course clone --- 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 473a854..b81c7b2 100644 --- a/yaksh/urls.py +++ b/yaksh/urls.py @@ -86,7 +86,7 @@ urlpatterns = [ views.show_statistics, name="show_statistics"), url(r'^manage/download_quiz_csv/(?P\d+)/(?P\d+)/$', views.download_quiz_csv, name="download_quiz_csv"), - url(r'^manage/duplicate_course/(?Pshallow|deep)/(?P\d+)/$', + url(r'^manage/duplicate_course/(?P\d+)/$', views.duplicate_course, name='duplicate_course'), url(r'manage/courses/$', views.courses, name='courses'), url(r'manage/add_course/$', views.add_course, name='add_course'), -- cgit From 91fa9c6a40e16f43d935db9641b6833605afc1e8 Mon Sep 17 00:00:00 2001 From: ankitjavalkar Date: Tue, 17 Oct 2017 12:48:51 +0530 Subject: Add a view to preview and download questionpapers --- yaksh/urls.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'yaksh/urls.py') diff --git a/yaksh/urls.py b/yaksh/urls.py index 08c2091..3120705 100644 --- a/yaksh/urls.py +++ b/yaksh/urls.py @@ -140,6 +140,7 @@ urlpatterns = [ views.download_assignment_file, name="download_quiz_assignment"), url(r'^manage/courses/download_yaml_template/', views.download_yaml_template, name="download_yaml_template"), +<<<<<<< HEAD url(r'^manage/download_sample_csv/', views.download_sample_csv, name="download_sample_csv"), url(r'^manage/courses/edit_lesson/$', @@ -172,4 +173,6 @@ urlpatterns = [ views.design_course, name="design_course"), url(r'^manage/course_status/(?P\d+)/$', views.course_status, name="course_status"), + url(r'^manage/download_questionpaper/(?P\d+)/$', + views.download_questionpaper, name="download_questionpaper"), ] -- cgit From 7a892b8c664a69bd054efc6c662281e839546b7d Mon Sep 17 00:00:00 2001 From: ankitjavalkar Date: Tue, 7 Nov 2017 15:49:35 +0530 Subject: - Change function names and urls to 'preview_questionpaper' - Add snippet to the questionpaper preview --- yaksh/urls.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'yaksh/urls.py') diff --git a/yaksh/urls.py b/yaksh/urls.py index 3120705..b4da1c0 100644 --- a/yaksh/urls.py +++ b/yaksh/urls.py @@ -140,6 +140,7 @@ urlpatterns = [ views.download_assignment_file, name="download_quiz_assignment"), url(r'^manage/courses/download_yaml_template/', views.download_yaml_template, name="download_yaml_template"), +<<<<<<< HEAD <<<<<<< HEAD url(r'^manage/download_sample_csv/', views.download_sample_csv, name="download_sample_csv"), @@ -175,4 +176,6 @@ urlpatterns = [ views.course_status, name="course_status"), url(r'^manage/download_questionpaper/(?P\d+)/$', views.download_questionpaper, name="download_questionpaper"), + url(r'^manage/preview_questionpaper/(?P\d+)/$', + views.preview_questionpaper, name="preview_questionpaper"), ] -- cgit From 9d689c2478d4f7f6f95f1e647dced17dd93e299c Mon Sep 17 00:00:00 2001 From: ankitjavalkar Date: Tue, 6 Mar 2018 12:01:59 +0530 Subject: Remove conflict related residual comment --- yaksh/urls.py | 4 ---- 1 file changed, 4 deletions(-) (limited to 'yaksh/urls.py') diff --git a/yaksh/urls.py b/yaksh/urls.py index b4da1c0..f5f8895 100644 --- a/yaksh/urls.py +++ b/yaksh/urls.py @@ -140,8 +140,6 @@ urlpatterns = [ views.download_assignment_file, name="download_quiz_assignment"), url(r'^manage/courses/download_yaml_template/', views.download_yaml_template, name="download_yaml_template"), -<<<<<<< HEAD -<<<<<<< HEAD url(r'^manage/download_sample_csv/', views.download_sample_csv, name="download_sample_csv"), url(r'^manage/courses/edit_lesson/$', @@ -174,8 +172,6 @@ urlpatterns = [ views.design_course, name="design_course"), url(r'^manage/course_status/(?P\d+)/$', views.course_status, name="course_status"), - url(r'^manage/download_questionpaper/(?P\d+)/$', - views.download_questionpaper, name="download_questionpaper"), url(r'^manage/preview_questionpaper/(?P\d+)/$', views.preview_questionpaper, name="preview_questionpaper"), ] -- cgit From ef5f9a8029ec19d0a039fff821106651aea9c426 Mon Sep 17 00:00:00 2001 From: ankitjavalkar Date: Mon, 2 Apr 2018 19:30:11 +0530 Subject: Upgrade Django from 1.9.5 to Django 1.10 - Change render_to_response usage to render --- 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 dd450ba..3611573 100644 --- a/yaksh/urls.py +++ b/yaksh/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import patterns, url +from django.conf.urls import url from yaksh import views urlpatterns = [ -- cgit From 7c04964f7a4cd7d2621e6e4396ffb3bee76d5b0e Mon Sep 17 00:00:00 2001 From: adityacp Date: Wed, 4 Apr 2018 15:35:22 +0530 Subject: Change views.py, models.py, urls.py, custom_filters.py - Add new view function to get per student course progress - Change model methods to calculate completion percentage for module and course - Add new url to fetch per student course progress - Remove unnecessary template tag from custom_filter.py --- 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 dd450ba..4d35e10 100644 --- a/yaksh/urls.py +++ b/yaksh/urls.py @@ -174,4 +174,6 @@ urlpatterns = [ views.course_status, name="course_status"), url(r'^manage/preview_questionpaper/(?P\d+)/$', views.preview_questionpaper, name="preview_questionpaper"), + url(r'^manage/get_user_status/(?P\d+)/(?P\d+)/$', + views.get_user_data, name="get_user_data") ] -- cgit From 97b657edc2a323f832c81f0e34ce5761bd21f7e9 Mon Sep 17 00:00:00 2001 From: adityacp Date: Thu, 24 May 2018 12:07:39 +0530 Subject: Pep8 changes --- yaksh/urls.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'yaksh/urls.py') diff --git a/yaksh/urls.py b/yaksh/urls.py index 2af1e70..db2c63b 100644 --- a/yaksh/urls.py +++ b/yaksh/urls.py @@ -9,7 +9,8 @@ urlpatterns = [ url(r'^activate/(?P.+)$', views.activate_user, name="activate"), url(r'^new_activation/$', views.new_activation, name='new_activation'), url(r'^quizzes/$', views.quizlist_user, name='quizlist_user'), - url(r'^quizzes/(?P\w+)/$', views.quizlist_user, name='quizlist_user'), + url(r'^quizzes/(?P\w+)/$', views.quizlist_user, + name='quizlist_user'), url(r'^results/$', views.results_user), url(r'^start/(?P\d+)/(?P\d+)/(?P\d+)/$', views.start), @@ -19,7 +20,7 @@ urlpatterns = [ views.quit), url(r'^complete/$', views.complete), url(r'^complete/(?P\d+)/(?P\d+)/(?P\d+)/(?P\d+)/$',\ - views.complete), + views.complete), url(r'^register/$', views.user_register, name="register"), url(r'^(?P\d+)/check/$', views.check, name="check"), url(r'^get_result/(?P\d+)/(?P\d+)/(?P\d+)/$', -- cgit From 0adb0d3b79980544bb5a724ce3b106dbd8e01c9c Mon Sep 17 00:00:00 2001 From: adityacp Date: Thu, 24 May 2018 12:37:54 +0530 Subject: Further pep8 changes --- yaksh/urls.py | 63 ++++++++++++++++++++++++++++++++++------------------------- 1 file changed, 36 insertions(+), 27 deletions(-) (limited to 'yaksh/urls.py') diff --git a/yaksh/urls.py b/yaksh/urls.py index db2c63b..c559011 100644 --- a/yaksh/urls.py +++ b/yaksh/urls.py @@ -26,13 +26,15 @@ urlpatterns = [ url(r'^get_result/(?P\d+)/(?P\d+)/(?P\d+)/$', views.get_result), url(r'^(?P\d+)/check/(?P\d+)/(?P\d+)/(?P\d+)/(?P\d+)/$',\ - views.check, name="check"), + views.check, name="check"), url(r'^(?P\d+)/skip/(?P\d+)/(?P\d+)/(?P\d+)/(?P\d+)/$', views.skip), url(r'^(?P\d+)/skip/(?P\d+)/(?P\d+)/(?P\d+)/(?P\d+)/(?P\d+)/$', views.skip), - url(r'^enroll_request/(?P\d+)/$', views.enroll_request, name='enroll_request'), - url(r'^self_enroll/(?P\d+)/$', views.self_enroll, name='self_enroll'), + url(r'^enroll_request/(?P\d+)/$', views.enroll_request, + name='enroll_request'), + url(r'^self_enroll/(?P\d+)/$', views.self_enroll, + name='self_enroll'), url(r'^view_answerpaper/(?P\d+)/(?P\d+)$', views.view_answerpaper, name='view_answerpaper'), url(r'^show_lesson/(?P\d+)/(?P\d+)/(?P\d+)/$', @@ -50,7 +52,7 @@ urlpatterns = [ url(r'^manage/$', views.prof_manage, name='manage'), url(r'^manage/addquestion/$', views.add_question, name="add_question"), url(r'^manage/addquestion/(?P\d+)/$', views.add_question, - name="add_question"), + name="add_question"), url(r'^manage/addquiz/$', views.add_quiz, name='add_quiz'), url(r'^manage/add_exercise/$', views.add_exercise, name='add_exercise'), url(r'^manage/add_exercise/(?P\d+)/$', views.add_exercise, @@ -63,11 +65,11 @@ urlpatterns = [ views.add_quiz, name='edit_quiz'), url(r'^manage/gradeuser/$', views.grade_user, name="grade_user"), url(r'^manage/gradeuser/(?P\d+)/(?P\d+)/$', - views.grade_user, name="grade_user"), + views.grade_user, name="grade_user"), url(r'^manage/gradeuser/(?P\d+)/(?P\d+)/(?P\d+)/$', - views.grade_user, name="grade_user"), + views.grade_user, name="grade_user"), url(r'^manage/gradeuser/(?P\d+)/(?P\d+)/(?P\d+)/(?P\d+)/$', - views.grade_user, name="grade_user"), + views.grade_user, name="grade_user"), url(r'^manage/questions/$', views.show_all_questions, name="show_questions"), url(r'^manage/monitor/$', views.monitor, name="monitor"), url(r'^manage/monitor/(?P\d+)/(?P\d+)/$', @@ -75,8 +77,8 @@ urlpatterns = [ url(r'^manage/user_data/(?P\d+)/(?P\d+)/(?P\d+)/$', views.user_data, name="user_data"), url(r'^manage/user_data/(?P\d+)/$', views.user_data), - url(r'^manage/quiz/designquestionpaper/(?P\d+)/$', views.design_questionpaper, - name='design_questionpaper'), + url(r'^manage/quiz/designquestionpaper/(?P\d+)/$', + views.design_questionpaper, name='design_questionpaper'), url(r'^manage/designquestionpaper/(?P\d+)/(?P\d+)/$', views.design_questionpaper, name='designquestionpaper'), url(r'^manage/designquestionpaper/(?P\d+)/(?P\d+)/(?P\d+)/$', @@ -91,45 +93,52 @@ urlpatterns = [ views.duplicate_course, name='duplicate_course'), url(r'manage/courses/$', views.courses, name='courses'), url(r'manage/add_course/$', views.add_course, name='add_course'), - url(r'manage/edit_course/(?P\d+)$', views.add_course, name='edit_course'), - url(r'manage/course_detail/(?P\d+)/$', views.course_detail, name='course_detail'), + url(r'manage/edit_course/(?P\d+)$', views.add_course, + name='edit_course'), + url(r'manage/course_detail/(?P\d+)/$', views.course_detail, + name='course_detail'), url(r'manage/enroll/(?P\d+)/(?P\d+)/$', views.enroll, - name="enroll_user"), + name="enroll_user"), url(r'manage/enroll/rejected/(?P\d+)/(?P\d+)/$', views.enroll, {'was_rejected': True}), - url(r'manage/upload_users/(?P\d+)/$', views.upload_users, name="upload_users"), - url(r'manage/send_mail/(?P\d+)/$', views.send_mail, name="send_mail"), + url(r'manage/upload_users/(?P\d+)/$', views.upload_users, + name="upload_users"), + url(r'manage/send_mail/(?P\d+)/$', views.send_mail, + name="send_mail"), url(r'manage/reject/(?P\d+)/(?P\d+)/$', views.reject, - name="reject_user"), + name="reject_user"), url(r'manage/enrolled/reject/(?P\d+)/(?P\d+)/$', views.reject, {'was_enrolled': True}, name="reject_user"), - url(r'manage/toggle_status/(?P\d+)/$', views.toggle_course_status, - name="toggle_course_status"), + url(r'manage/toggle_status/(?P\d+)/$', + views.toggle_course_status, name="toggle_course_status"), url(r'^ajax/questions/filter/$', views.ajax_questions_filter, - name="questions_filter"), + name="questions_filter"), url(r'^editprofile/$', views.edit_profile, name='edit_profile'), url(r'^viewprofile/$', views.view_profile, name='view_profile'), - url(r'^manage/enroll/(?P\d+)/$', views.enroll, name="enroll_users"), + url(r'^manage/enroll/(?P\d+)/$', views.enroll, + name="enroll_users"), url(r'manage/enroll/rejected/(?P\d+)/$', views.enroll, {'was_rejected': True}), url(r'manage/enrolled/reject/(?P\d+)/$', views.reject, {'was_enrolled': True}, name="reject_users"), url(r'^manage/searchteacher/(?P\d+)/$', views.search_teacher), - url(r'^manage/addteacher/(?P\d+)/$', views.add_teacher, name='add_teacher'), - url(r'^manage/remove_teachers/(?P\d+)/$', views.remove_teachers, name='remove_teacher'), + url(r'^manage/addteacher/(?P\d+)/$', views.add_teacher, + name='add_teacher'), + url(r'^manage/remove_teachers/(?P\d+)/$', views.remove_teachers, + name='remove_teacher'), url(r'^manage/download_questions/$', views.show_all_questions, - name="show_questions"), + name="show_questions"), url(r'^manage/upload_questions/$', views.show_all_questions, - name="show_questions"), + name="show_questions"), url(r'^manage/grader/$', views.grader, name='grader'), url(r'^manage/regrade/question/(?P\d+)/(?P\d+)/$', - views.regrade, name='regrade'), + views.regrade, name='regrade'), url(r'^manage/regrade/questionpaper/(?P\d+)/(?P\d+)/(?P\d+)/$', - views.regrade, name='regrade'), + views.regrade, name='regrade'), url(r'^manage/regrade/answerpaper/(?P\d+)/(?P\d+)/(?P\d+)/$', - views.regrade, name='regrade'), + views.regrade, name='regrade'), url(r'^manage/regrade/paper/(?P\d+)/(?P\d+)/$', - views.regrade, name='regrade'), + views.regrade, name='regrade'), url(r'^manage/(?Pgodmode|usermode)/(?P\d+)/(?P\d+)/$', views.test_quiz), url(r'^manage/create_demo_course/$', views.create_demo_course), -- cgit From d0c7f9eb35651fadffb53e32d6baf8a2efb55840 Mon Sep 17 00:00:00 2001 From: adityacp Date: Mon, 28 May 2018 12:38:21 +0530 Subject: One more round of pep8 changes --- yaksh/urls.py | 77 +++++++++++++++++++++++++++++++++++------------------------ 1 file changed, 46 insertions(+), 31 deletions(-) (limited to 'yaksh/urls.py') diff --git a/yaksh/urls.py b/yaksh/urls.py index c559011..1e1def6 100644 --- a/yaksh/urls.py +++ b/yaksh/urls.py @@ -12,24 +12,27 @@ urlpatterns = [ url(r'^quizzes/(?P\w+)/$', views.quizlist_user, name='quizlist_user'), url(r'^results/$', views.results_user), - url(r'^start/(?P\d+)/(?P\d+)/(?P\d+)/$', - views.start), - url(r'^start/(?P\d+)/(?P\d+)/(?P\d+)/(?P\d+)/$', - views.start), - url(r'^quit/(?P\d+)/(?P\d+)/(?P\d+)/(?P\d+)/$', - views.quit), + url(r'^start/(?P\d+)/(?P\d+)/' + '(?P\d+)/$', views.start), + url(r'^start/(?P\d+)/(?P\d+)/' + '(?P\d+)/(?P\d+)/$', views.start), + url(r'^quit/(?P\d+)/(?P\d+)/' + '(?P\d+)/(?P\d+)/$', views.quit), url(r'^complete/$', views.complete), - url(r'^complete/(?P\d+)/(?P\d+)/(?P\d+)/(?P\d+)/$',\ - views.complete), + url(r'^complete/(?P\d+)/(?P\d+)/' + '(?P\d+)/(?P\d+)/$', views.complete), url(r'^register/$', views.user_register, name="register"), url(r'^(?P\d+)/check/$', views.check, name="check"), url(r'^get_result/(?P\d+)/(?P\d+)/(?P\d+)/$', views.get_result), - url(r'^(?P\d+)/check/(?P\d+)/(?P\d+)/(?P\d+)/(?P\d+)/$',\ + url(r'^(?P\d+)/check/(?P\d+)/(?P\d+)/' + '(?P\d+)/(?P\d+)/$', views.check, name="check"), - url(r'^(?P\d+)/skip/(?P\d+)/(?P\d+)/(?P\d+)/(?P\d+)/$', + url(r'^(?P\d+)/skip/(?P\d+)/(?P\d+)/' + '(?P\d+)/(?P\d+)/$', views.skip), - url(r'^(?P\d+)/skip/(?P\d+)/(?P\d+)/(?P\d+)/(?P\d+)/(?P\d+)/$', + url(r'^(?P\d+)/skip/(?P\d+)/(?P\d+)/' + '(?P\d+)/(?P\d+)/(?P\d+)/$', views.skip), url(r'^enroll_request/(?P\d+)/$', views.enroll_request, name='enroll_request'), @@ -37,15 +40,16 @@ urlpatterns = [ name='self_enroll'), url(r'^view_answerpaper/(?P\d+)/(?P\d+)$', views.view_answerpaper, name='view_answerpaper'), - url(r'^show_lesson/(?P\d+)/(?P\d+)/(?P\d+)/$', - views.show_lesson, name='show_lesson'), + url(r'^show_lesson/(?P\d+)/(?P\d+)/' + '(?P\d+)/$', views.show_lesson, name='show_lesson'), url(r'^quizzes/view_module/(?P\d+)/(?P\d+)/$', views.view_module, name='view_module'), - url(r'^next_unit/(?P\d+)/(?P\d+)/(?P\d+)/$', - views.get_next_unit, name='next_unit'), + url(r'^next_unit/(?P\d+)/(?P\d+)/' + '(?P\d+)/$', views.get_next_unit, name='next_unit'), url(r'^next_unit/(?P\d+)/(?P\d+)/$', views.get_next_unit, name='next_unit'), - url(r'^next_unit/(?P\d+)/(?P\d+)/(?P\d+)/(?P\d+)/$', + url(r'^next_unit/(?P\d+)/(?P\d+)/' + '(?P\d+)/(?P\d+)/$', views.get_next_unit, name='next_unit'), url(r'^course_modules/(?P\d+)/$', views.course_modules, name='course_modules'), @@ -66,26 +70,34 @@ urlpatterns = [ url(r'^manage/gradeuser/$', views.grade_user, name="grade_user"), url(r'^manage/gradeuser/(?P\d+)/(?P\d+)/$', views.grade_user, name="grade_user"), - url(r'^manage/gradeuser/(?P\d+)/(?P\d+)/(?P\d+)/$', + url(r'^manage/gradeuser/(?P\d+)/(?P\d+)/' + '(?P\d+)/$', views.grade_user, name="grade_user"), - url(r'^manage/gradeuser/(?P\d+)/(?P\d+)/(?P\d+)/(?P\d+)/$', + url(r'^manage/gradeuser/(?P\d+)/(?P\d+)/' + '(?P\d+)/(?P\d+)/$', views.grade_user, name="grade_user"), - url(r'^manage/questions/$', views.show_all_questions, name="show_questions"), + url(r'^manage/questions/$', views.show_all_questions, + name="show_questions"), url(r'^manage/monitor/$', views.monitor, name="monitor"), url(r'^manage/monitor/(?P\d+)/(?P\d+)/$', views.monitor, name="monitor"), - url(r'^manage/user_data/(?P\d+)/(?P\d+)/(?P\d+)/$', + url(r'^manage/user_data/(?P\d+)/(?P\d+)/' + '(?P\d+)/$', views.user_data, name="user_data"), url(r'^manage/user_data/(?P\d+)/$', views.user_data), url(r'^manage/quiz/designquestionpaper/(?P\d+)/$', views.design_questionpaper, name='design_questionpaper'), - url(r'^manage/designquestionpaper/(?P\d+)/(?P\d+)/$', + url(r'^manage/designquestionpaper/(?P\d+)/' + '(?P\d+)/$', views.design_questionpaper, name='designquestionpaper'), - url(r'^manage/designquestionpaper/(?P\d+)/(?P\d+)/(?P\d+)/$', + url(r'^manage/designquestionpaper/(?P\d+)/' + '(?P\d+)/(?P\d+)/$', views.design_questionpaper, name='designquestionpaper'), - url(r'^manage/statistics/question/(?P\d+)/(?P\d+)/$', + url(r'^manage/statistics/question/(?P\d+)/' + '(?P\d+)/$', views.show_statistics, name="show_statistics"), - url(r'^manage/statistics/question/(?P\d+)/(?P\d+)/(?P\d+)/$', + url(r'^manage/statistics/question/(?P\d+)/' + '(?P\d+)/(?P\d+)/$', views.show_statistics, name="show_statistics"), url(r'^manage/download_quiz_csv/(?P\d+)/(?P\d+)/$', views.download_quiz_csv, name="download_quiz_csv"), @@ -133,18 +145,21 @@ urlpatterns = [ url(r'^manage/grader/$', views.grader, name='grader'), url(r'^manage/regrade/question/(?P\d+)/(?P\d+)/$', views.regrade, name='regrade'), - url(r'^manage/regrade/questionpaper/(?P\d+)/(?P\d+)/(?P\d+)/$', + url(r'^manage/regrade/questionpaper/(?P\d+)/' + '(?P\d+)/(?P\d+)/$', views.regrade, name='regrade'), - url(r'^manage/regrade/answerpaper/(?P\d+)/(?P\d+)/(?P\d+)/$', + url(r'^manage/regrade/answerpaper/(?P\d+)/' + '(?P\d+)/(?P\d+)/$', views.regrade, name='regrade'), url(r'^manage/regrade/paper/(?P\d+)/(?P\d+)/$', views.regrade, name='regrade'), - url(r'^manage/(?Pgodmode|usermode)/(?P\d+)/(?P\d+)/$', - views.test_quiz), + url(r'^manage/(?Pgodmode|usermode)/(?P\d+)/' + '(?P\d+)/$', views.test_quiz), url(r'^manage/create_demo_course/$', views.create_demo_course), url(r'^manage/courses/download_course_csv/(?P\d+)/$', views.download_course_csv, name="download_course_csv"), - url(r'^manage/download/user_assignment/(?P\d+)/(?P\d+)/(?P\d+)/$', + url(r'^manage/download/user_assignment/(?P\d+)/' + '(?P\d+)/(?P\d+)/$', views.download_assignment_file, name="download_user_assignment"), url(r'^manage/download/quiz_assignments/(?P\d+)/$', views.download_assignment_file, name="download_quiz_assignment"), @@ -160,8 +175,8 @@ urlpatterns = [ views.edit_lesson, name="edit_lesson"), url(r'^manage/courses/designmodule/(?P\d+)/$', views.design_module, name="design_module"), - url(r'^manage/courses/designmodule/(?P\d+)/(?P\d+)/$', - views.design_module, name="design_module"), + url(r'^manage/courses/designmodule/(?P\d+)/' + '(?P\d+)/$', views.design_module, name="design_module"), url(r'^manage/courses/all_quizzes/$', views.show_all_quizzes, name="show_all_quizzes"), url(r'^manage/courses/all_lessons/$', -- cgit