From b835440b1e2ca0059e95b6848cb87cc5724ee967 Mon Sep 17 00:00:00 2001 From: adityacp Date: Sat, 28 Mar 2020 16:59:10 +0530 Subject: Fix workflow for creating modules, lessons, quizzes --- yaksh/urls.py | 39 ++++++++++++--------------------------- 1 file changed, 12 insertions(+), 27 deletions(-) (limited to 'yaksh/urls.py') 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\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\d+)/$', views.add_exercise, - name='edit_exercise'), - url(r'^manage/add_exercise/(?P\d+)/(?P\d+)/$', + url(r'^manage/add_exercise/(?P\d+)/(?P\d+)/$', + views.add_exercise, name='add_exercise'), + url(r'^manage/add_exercise/(?P\d+)/(?P\d+)/(?P\d+)$', views.add_exercise, name='edit_exercise'), - url(r'^manage/addquiz/(?P\d+)/$', - views.add_quiz, name='edit_quiz'), - url(r'^manage/addquiz/(?P\d+)/(?P\d+)$', + url(r'^manage/addquiz/(?P\d+)/(?P\d+)/$', + views.add_quiz, name='add_quiz'), + url(r'^manage/addquiz/(?P\d+)/(?P\d+)/(?P\d+)$', views.add_quiz, name='edit_quiz'), url(r'^manage/gradeuser/$', views.grade_user, name="grade_user"), url(r'^manage/gradeuser/(?P\d+)/(?P\d+)/$', @@ -91,13 +89,10 @@ urlpatterns = [ '(?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='designquestionpaper'), - url(r'^manage/designquestionpaper/(?P\d+)/' + url(r'^manage/designquestionpaper/(?P\d+)/(?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+)/$', views.design_questionpaper, name='designquestionpaper'), url(r'^manage/statistics/question/(?P\d+)/' '(?P\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\d+)/(?P\d+)/$', views.edit_lesson, name="edit_lesson"), - url(r'^manage/courses/edit_lesson/(?P\d+)/$', - views.edit_lesson, name="edit_lesson"), - url(r'^manage/courses/edit_lesson/(?P\d+)/(?P\d+)/$', + url(r'^manage/courses/edit_lesson/(?P\d+)/(?P\d+)/(?P\d+)/$', 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/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\d+)/$', views.add_module, name="add_module"), - url(r'^manage/courses/add_module/(?P\d+)/$', - views.add_module, name="edit_module"), - url(r'^manage/courses/add_module/(?P\d+)/(?P\d+)/$', + url(r'^manage/courses/add_module/(?P\d+)/(?P\d+)/$', views.add_module, name="edit_module"), url(r'^manage/courses/designcourse/(?P\d+)/$', views.design_course, name="design_course"), -- cgit From ce3eb1dbbd924003489d01f4e98aba841cd803c0 Mon Sep 17 00:00:00 2001 From: adityacp Date: Wed, 8 Apr 2020 15:55:59 +0530 Subject: Change templates, views, forms, models - Allow to test, download and delete single question - Fix pagination for searching and filtering questions --- yaksh/urls.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'yaksh/urls.py') diff --git a/yaksh/urls.py b/yaksh/urls.py index bdc3330..6085c51 100644 --- a/yaksh/urls.py +++ b/yaksh/urls.py @@ -124,7 +124,7 @@ urlpatterns = [ 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'^ajax/questions/filter/$', views.ajax_questions_filter, + url(r'^questions/filter$', views.questions_filter, name="questions_filter"), url(r'^editprofile/$', views.edit_profile, name='edit_profile'), url(r'^viewprofile/$', views.view_profile, name='view_profile'), @@ -205,4 +205,12 @@ urlpatterns = [ views.course_teachers, name="course_teachers"), url(r'^manage/download/course/progress/(?P\d+)', views.download_course_progress, name="download_course_progress"), + url(r'^manage/question/download/(?P\d+)', + views.download_question, name="download_question"), + url(r'^manage/question/test/(?P\d+)', + views.test_question, name="test_question"), + url(r'^manage/question/delete/(?P\d+)', + views.delete_question, name="delete_question"), + url(r'^manage/search/questions', views.search_questions_by_tags, + name="search_questions_by_tags"), ] -- cgit From 2a9f81cb32acfd7a2efc18f58c4529b39ce4061b Mon Sep 17 00:00:00 2001 From: CruiseDevice Date: Sat, 11 Apr 2020 17:45:31 +0530 Subject: Discussion forum for a course --- 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 bdc3330..47cfad4 100644 --- a/yaksh/urls.py +++ b/yaksh/urls.py @@ -59,6 +59,8 @@ urlpatterns = [ views.get_next_unit, name='next_unit'), url(r'^course_modules/(?P\d+)/$', views.course_modules, name='course_modules'), + url(r'^forum/(?P\d+)/$', views.course_forum, name='course_forum'), + url(r'^forum/(?P\d+)/thread/(?P[0-9a-f-]+)/', views.thread_comments, name='thread_comments'), 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, -- cgit From 0e6c7d589114450d5cd1bc581ee1692c235f1a73 Mon Sep 17 00:00:00 2001 From: CruiseDevice Date: Mon, 13 Apr 2020 16:45:42 +0530 Subject: Add feature for uploading images --- yaksh/urls.py | 1 + 1 file changed, 1 insertion(+) (limited to 'yaksh/urls.py') diff --git a/yaksh/urls.py b/yaksh/urls.py index 47cfad4..a8aa224 100644 --- a/yaksh/urls.py +++ b/yaksh/urls.py @@ -61,6 +61,7 @@ urlpatterns = [ views.course_modules, name='course_modules'), url(r'^forum/(?P\d+)/$', views.course_forum, name='course_forum'), url(r'^forum/(?P\d+)/thread/(?P[0-9a-f-]+)/', views.thread_comments, name='thread_comments'), + url(r'^forum/(?P\d+)/thread/(?P[0-9a-f-]+)/delete/', views.delete_thread, name='delete_thread'), 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, -- cgit From 2f9331717075b34534f2745706f57a98f7dce20d Mon Sep 17 00:00:00 2001 From: CruiseDevice Date: Mon, 13 Apr 2020 17:27:49 +0530 Subject: Add feature to hide thread or comments --- yaksh/urls.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'yaksh/urls.py') diff --git a/yaksh/urls.py b/yaksh/urls.py index a8aa224..1b86ae8 100644 --- a/yaksh/urls.py +++ b/yaksh/urls.py @@ -60,8 +60,10 @@ urlpatterns = [ url(r'^course_modules/(?P\d+)/$', views.course_modules, name='course_modules'), url(r'^forum/(?P\d+)/$', views.course_forum, name='course_forum'), - url(r'^forum/(?P\d+)/thread/(?P[0-9a-f-]+)/', views.thread_comments, name='thread_comments'), - url(r'^forum/(?P\d+)/thread/(?P[0-9a-f-]+)/delete/', views.delete_thread, name='delete_thread'), + url(r'^forum/(?P\d+)/thread/(?P[0-9a-f-]+)/$', views.thread_comments, name='thread_comments'), + url(r'^forum/(?P\d+)/thread/(?P[0-9a-f-]+)/delete/', views.hide_thread, name='hide_thread'), + url(r'^forum/(?P\d+)/comment/(?P[0-9a-f-]+)/delete/', views.hide_comment, name='hide_comment'), + 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, -- cgit From 508e0e78bb0bd3e8ebbad81e948f13de5c01b20f Mon Sep 17 00:00:00 2001 From: CruiseDevice Date: Tue, 14 Apr 2020 20:13:52 +0530 Subject: Change model name Thread to Post to avoid conflicts - Thread class from threading conflicts with the forum Thread model. - Tests for models and views. - PEP8 fix. --- yaksh/urls.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'yaksh/urls.py') diff --git a/yaksh/urls.py b/yaksh/urls.py index 1b86ae8..72febc0 100644 --- a/yaksh/urls.py +++ b/yaksh/urls.py @@ -59,11 +59,18 @@ urlpatterns = [ views.get_next_unit, name='next_unit'), url(r'^course_modules/(?P\d+)/$', views.course_modules, name='course_modules'), - url(r'^forum/(?P\d+)/$', views.course_forum, name='course_forum'), - url(r'^forum/(?P\d+)/thread/(?P[0-9a-f-]+)/$', views.thread_comments, name='thread_comments'), - url(r'^forum/(?P\d+)/thread/(?P[0-9a-f-]+)/delete/', views.hide_thread, name='hide_thread'), - url(r'^forum/(?P\d+)/comment/(?P[0-9a-f-]+)/delete/', views.hide_comment, name='hide_comment'), - + url(r'^forum/(?P\d+)/$', + views.course_forum, + name='course_forum'), + url(r'^forum/(?P\d+)/post/(?P[0-9a-f-]+)/$', + views.post_comments, + name='post_comments'), + url(r'^forum/(?P\d+)/post/(?P[0-9a-f-]+)/delete/', + views.hide_post, + name='hide_post'), + url(r'^forum/(?P\d+)/comment/(?P[0-9a-f-]+)/delete/', + views.hide_comment, + name='hide_comment'), 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, -- cgit