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