Fix workflow for creating modules, lessons, quizzes

1 files changed, 12 insertions, 27 deletions

diff --git a/yaksh/urls.py b/yaksh/urls.py
index b53d335..bdc3330 100644
--- a/yaksh/urls.py
+++ b/yaksh/urls.py
@@ -63,15 +63,13 @@ urlpatterns = [
     url(r'^manage/addquestion/$', views.add_question, name="add_question"),
     url(r'^manage/addquestion/(?P<question_id>\d+)/$', views.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<quiz_id>\d+)/$', views.add_exercise,
-        name='edit_exercise'),
-    url(r'^manage/add_exercise/(?P<quiz_id>\d+)/(?P<course_id>\d+)/$',
+    url(r'^manage/add_exercise/(?P<course_id>\d+)/(?P<module_id>\d+)/$',
+        views.add_exercise, name='add_exercise'),
+    url(r'^manage/add_exercise/(?P<course_id>\d+)/(?P<module_id>\d+)/(?P<quiz_id>\d+)$',
         views.add_exercise, name='edit_exercise'),
-    url(r'^manage/addquiz/(?P<quiz_id>\d+)/$',
-        views.add_quiz, name='edit_quiz'),
-    url(r'^manage/addquiz/(?P<quiz_id>\d+)/(?P<course_id>\d+)$',
+    url(r'^manage/addquiz/(?P<course_id>\d+)/(?P<module_id>\d+)/$',
+        views.add_quiz, name='add_quiz'),
+    url(r'^manage/addquiz/(?P<course_id>\d+)/(?P<module_id>\d+)/(?P<quiz_id>\d+)$',
         views.add_quiz, name='edit_quiz'),
     url(r'^manage/gradeuser/$', views.grade_user, name="grade_user"),
     url(r'^manage/gradeuser/(?P<quiz_id>\d+)/(?P<course_id>\d+)/$',
@@ -91,13 +89,10 @@ urlpatterns = [
         '(?P<course_id>\d+)/$',
         views.user_data, name="user_data"),
     url(r'^manage/user_data/(?P<user_id>\d+)/$', views.user_data),
-    url(r'^manage/quiz/designquestionpaper/(?P<quiz_id>\d+)/$',
-        views.design_questionpaper, name='designquestionpaper'),
-    url(r'^manage/designquestionpaper/(?P<quiz_id>\d+)/'
+    url(r'^manage/designquestionpaper/(?P<course_id>\d+)/(?P<quiz_id>\d+)/'
         '(?P<questionpaper_id>\d+)/$',
         views.design_questionpaper, name='designquestionpaper'),
-    url(r'^manage/designquestionpaper/(?P<quiz_id>\d+)/'
-        '(?P<questionpaper_id>\d+)/(?P<course_id>\d+)/$',
+    url(r'^manage/designquestionpaper/(?P<course_id>\d+)/(?P<quiz_id>\d+)/$',
         views.design_questionpaper, name='designquestionpaper'),
     url(r'^manage/statistics/question/(?P<questionpaper_id>\d+)/'
         '(?P<course_id>\d+)/$',
@@ -176,29 +171,19 @@ urlpatterns = [
         views.download_yaml_template, name="download_yaml_template"),
     url(r'^manage/download_sample_csv/',
         views.download_sample_csv, name="download_sample_csv"),
-    url(r'^manage/courses/edit_lesson/$',
+    url(r'^manage/courses/edit_lesson/(?P<course_id>\d+)/(?P<module_id>\d+)/$',
         views.edit_lesson, name="edit_lesson"),
-    url(r'^manage/courses/edit_lesson/(?P<lesson_id>\d+)/$',
-        views.edit_lesson, name="edit_lesson"),
-    url(r'^manage/courses/edit_lesson/(?P<lesson_id>\d+)/(?P<course_id>\d+)/$',
+    url(r'^manage/courses/edit_lesson/(?P<course_id>\d+)/(?P<module_id>\d+)/(?P<lesson_id>\d+)/$',
         views.edit_lesson, name="edit_lesson"),
     url(r'^manage/courses/designmodule/(?P<module_id>\d+)/$',
         views.design_module, name="design_module"),
     url(r'^manage/courses/designmodule/(?P<module_id>\d+)/'
         '(?P<course_id>\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/$',
-        views.show_all_lessons, name="show_all_lessons"),
     url(r'^manage/courses/lesson/preview/$',
         views.preview_html_text, name="preview_html_text"),
-    url(r'^manage/courses/all_learning_module/$',
-        views.show_all_modules, name="show_all_modules"),
-    url(r'^manage/courses/add_module/$',
+    url(r'^manage/courses/add_module/(?P<course_id>\d+)/$',
         views.add_module, name="add_module"),
-    url(r'^manage/courses/add_module/(?P<module_id>\d+)/$',
-        views.add_module, name="edit_module"),
-    url(r'^manage/courses/add_module/(?P<module_id>\d+)/(?P<course_id>\d+)/$',
+    url(r'^manage/courses/add_module/(?P<course_id>\d+)/(?P<module_id>\d+)/$',
         views.add_module, name="edit_module"),
     url(r'^manage/courses/designcourse/(?P<course_id>\d+)/$',
         views.design_course, name="design_course"),