Change in urls.py

- Add new urls for creating course with module and units
- Fix existing urls

1 files changed, 64 insertions, 19 deletions

diff --git a/yaksh/urls.py b/yaksh/urls.py
index 7f484b9..8348666 100644
--- a/yaksh/urls.py
+++ b/yaksh/urls.py
@@ -11,50 +11,66 @@ urlpatterns = [
     url(r'^quizzes/$', views.quizlist_user, name='quizlist_user'),
     url(r'^quizzes/(?P<enrolled>\w+)/$', views.quizlist_user, name='quizlist_user'),
     url(r'^results/$', views.results_user),
-    url(r'^start/$', views.start),
-    url(r'^start/(?P<questionpaper_id>\d+)/$', views.start),
-    url(r'^start/(?P<attempt_num>\d+)/(?P<questionpaper_id>\d+)/$', views.start),
-    url(r'^quit/(?P<attempt_num>\d+)/(?P<questionpaper_id>\d+)/$', views.quit),
+    url(r'^start/(?P<questionpaper_id>\d+)/(?P<module_id>\d+)/(?P<course_id>\d+)/$',
+        views.start),
+    url(r'^start/(?P<attempt_num>\d+)/(?P<module_id>\d+)/(?P<questionpaper_id>\d+)/(?P<course_id>\d+)/$',
+        views.start),
+    url(r'^quit/(?P<attempt_num>\d+)/(?P<module_id>\d+)/(?P<questionpaper_id>\d+)/(?P<course_id>\d+)/$',
+        views.quit),
     url(r'^complete/$', views.complete),
-    url(r'^complete/(?P<attempt_num>\d+)/(?P<questionpaper_id>\d+)/$',\
+    url(r'^complete/(?P<attempt_num>\d+)/(?P<module_id>\d+)/(?P<questionpaper_id>\d+)/(?P<course_id>\d+)/$',\
             views.complete),
     url(r'^register/$', views.user_register, name="register"),
     url(r'^(?P<q_id>\d+)/check/$', views.check, name="check"),
-    url(r'^get_result/(?P<uid>\d+)/$', views.get_result),
-    url(r'^(?P<q_id>\d+)/check/(?P<attempt_num>\d+)/(?P<questionpaper_id>\d+)/$',\
+    url(r'^get_result/(?P<uid>\d+)/(?P<course_id>\d+)/(?P<module_id>\d+)/$',
+        views.get_result),
+    url(r'^(?P<q_id>\d+)/check/(?P<attempt_num>\d+)/(?P<module_id>\d+)/(?P<questionpaper_id>\d+)/(?P<course_id>\d+)/$',\
             views.check, name="check"),
-    url(r'^(?P<q_id>\d+)/skip/(?P<attempt_num>\d+)/(?P<questionpaper_id>\d+)/$',
+    url(r'^(?P<q_id>\d+)/skip/(?P<attempt_num>\d+)/(?P<module_id>\d+)/(?P<questionpaper_id>\d+)/(?P<course_id>\d+)/$',
         views.skip),
-    url(r'^(?P<q_id>\d+)/skip/(?P<next_q>\d+)/(?P<attempt_num>\d+)/(?P<questionpaper_id>\d+)/$',
+    url(r'^(?P<q_id>\d+)/skip/(?P<next_q>\d+)/(?P<attempt_num>\d+)/(?P<module_id>\d+)/(?P<questionpaper_id>\d+)/(?P<course_id>\d+)/$',
         views.skip),
     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'^show_video/(?P<lesson_id>\d+)/(?P<module_id>\d+)/(?P<course_id>\d+)/$',
+        views.show_video, name='show_video'),
+    url(r'^quizzes/view_module/(?P<module_id>\d+)/(?P<course_id>\d+)/$',
+        views.view_module, name='view_module'),
+    url(r'^next_unit/(?P<course_id>\d+)/(?P<module_id>\d+)/(?P<current_unit_id>\d+)/$',
+        views.get_next_unit, name='next_unit'),
+    url(r'^next_unit/(?P<course_id>\d+)/(?P<module_id>\d+)/(?P<current_unit_id>\d+)/(?P<first_unit>\d+)/$',
+        views.get_next_unit, name='next_unit'),
     url(r'^manage/$', views.prof_manage, name='manage'),
     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/(?P<course_id>\d+)/$', views.add_quiz, name='add_quiz'),
-    url(r'^manage/addquiz/(?P<course_id>\d+)/(?P<quiz_id>\d+)/$', views.add_quiz, name='edit_quiz'),
+    url(r'^manage/addquiz/$', views.add_quiz, name='add_quiz'),
+    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+)$',
+        views.add_quiz, name='edit_quiz'),
     url(r'^manage/gradeuser/$', views.grade_user, name="grade_user"),
-    url(r'^manage/gradeuser/(?P<quiz_id>\d+)/$',views.grade_user, name="grade_user"),
-    url(r'^manage/gradeuser/(?P<quiz_id>\d+)/(?P<user_id>\d+)/$',
+    url(r'^manage/gradeuser/(?P<quiz_id>\d+)/(?P<course_id>\d+)/$',
             views.grade_user, name="grade_user"),
-    url(r'^manage/gradeuser/(?P<quiz_id>\d+)/(?P<user_id>\d+)/(?P<attempt_number>\d+)/$',
+    url(r'^manage/gradeuser/(?P<quiz_id>\d+)/(?P<user_id>\d+)/(?P<course_id>\d+)/$',
+            views.grade_user, name="grade_user"),
+    url(r'^manage/gradeuser/(?P<quiz_id>\d+)/(?P<user_id>\d+)/(?P<attempt_number>\d+)/(?P<course_id>\d+)/$',
             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<quiz_id>\d+)/$', views.monitor, name="monitor"),
-    url(r'^manage/user_data/(?P<user_id>\d+)/(?P<questionpaper_id>\d+)/$',
+    url(r'^manage/monitor/(?P<quiz_id>\d+)/(?P<course_id>\d+)/$',
+        views.monitor, name="monitor"),
+    url(r'^manage/user_data/(?P<user_id>\d+)/(?P<questionpaper_id>\d+)/(?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='design_questionpaper'),
     url(r'^manage/designquestionpaper/(?P<quiz_id>\d+)/(?P<questionpaper_id>\d+)/$',
         views.design_questionpaper, name='designquestionpaper'),
-    url(r'^manage/statistics/question/(?P<questionpaper_id>\d+)/$',
+    url(r'^manage/statistics/question/(?P<questionpaper_id>\d+)/(?P<course_id>\d+)/$',
         views.show_statistics, name="show_statistics"),
-    url(r'^manage/statistics/question/(?P<questionpaper_id>\d+)/(?P<attempt_number>\d+)/$',
+    url(r'^manage/statistics/question/(?P<questionpaper_id>\d+)/(?P<attempt_number>\d+)/(?P<course_id>\d+)/$',
         views.show_statistics, name="show_statistics"),
     url(r'^manage/download_quiz_csv/(?P<course_id>\d+)/(?P<quiz_id>\d+)/$',
         views.download_quiz_csv, name="download_quiz_csv"),
@@ -101,7 +117,8 @@ urlpatterns = [
             views.regrade, name='regrade'),
     url(r'^manage/regrade/paper/(?P<course_id>\d+)/(?P<answerpaper_id>\d+)/$',
             views.regrade, name='regrade'),
-    url(r'^manage/(?P<mode>godmode|usermode)/(?P<quiz_id>\d+)/$', views.test_quiz),
+    url(r'^manage/(?P<mode>godmode|usermode)/(?P<quiz_id>\d+)/(?P<course_id>\d+)/$',
+        views.test_quiz),
     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, name="download_course_csv"),
@@ -113,4 +130,32 @@ 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/$',
+        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+)/$',
+        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/$',
+        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+)/$',
+        views.add_module, name="edit_module"),
+    url(r'^manage/courses/designcourse/(?P<course_id>\d+)/$',
+        views.design_course, name="design_course"),
+    url(r'^manage/courses/designcourse/(?P<course_id>\d+)/$',
+        views.design_course, name="design_course"),
 ]