From d54b62c2803f0f0edb45348f47d6a541ca09e022 Mon Sep 17 00:00:00 2001 From: adityacp Date: Wed, 26 Aug 2020 20:29:03 +0530 Subject: First cut for in video quizzes --- yaksh/urls.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'yaksh/urls.py') diff --git a/yaksh/urls.py b/yaksh/urls.py index 0639b25..7cf3bf7 100644 --- a/yaksh/urls.py +++ b/yaksh/urls.py @@ -237,4 +237,18 @@ urlpatterns = [ views.mark_notification, name="mark_notification"), path('mark/notifications', views.mark_notification, name="mark_notification"), + path('manage/add/marker//', views.add_marker, + name='add_marker'), + path('manage/add/topic//', views.add_topic, + name='add_topic'), + path('manage/edit/topic///', + views.add_topic, name='edit_topic'), + path('manage/add/quiz//', + views.add_marker_quiz, name='add_marker_quiz'), + path('manage/edit/quiz////', + views.add_marker_quiz, name='edit_marker_quiz'), + path('manage/add/exercise//', + views.add_marker_quiz, name='add_marker_exercise'), + path('manage/edit/exercise////', + views.add_marker_quiz, name='edit_marker_exercise') ] -- cgit From 23c6caab733f5bba6458a07a6666a0580ee2e6a9 Mon Sep 17 00:00:00 2001 From: adityacp Date: Thu, 3 Sep 2020 18:18:18 +0530 Subject: Change views, forms, models, urls - Disable the question type in video question form - Change urls to add graded quiz, exercise, poll type question - Save the topic and question in table of contents - Rename lesson attribute in TableOfContents model --- yaksh/urls.py | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'yaksh/urls.py') diff --git a/yaksh/urls.py b/yaksh/urls.py index 7cf3bf7..2c462b3 100644 --- a/yaksh/urls.py +++ b/yaksh/urls.py @@ -239,16 +239,20 @@ urlpatterns = [ name="mark_notification"), path('manage/add/marker//', views.add_marker, name='add_marker'), - path('manage/add/topic//', views.add_topic, - name='add_topic'), - path('manage/edit/topic///', + path('manage/add/lesson/topic///', + views.add_topic, name='add_topic'), + path('manage/edit/lesson/topic////', views.add_topic, name='edit_topic'), - path('manage/add/quiz//', + path('manage/add/lesson/quiz///', views.add_marker_quiz, name='add_marker_quiz'), - path('manage/edit/quiz////', + path('manage/edit/lesson/quiz////', views.add_marker_quiz, name='edit_marker_quiz'), - path('manage/add/exercise//', - views.add_marker_quiz, name='add_marker_exercise'), - path('manage/edit/exercise////', - views.add_marker_quiz, name='edit_marker_exercise') + path('manage/add/lesson/exercise///', + views.add_marker_quiz, name='add_marker_quiz'), + path('manage/edit/lesson/exercise////', + views.add_marker_quiz, name='edit_marker_quiz'), + path('manage/add/lesson/poll///', + views.add_marker_quiz, name='add_marker_quiz'), + path('manage/edit/lesson/poll////', + views.add_marker_quiz, name='edit_marker_quiz') ] -- cgit From 7e5608d0853d69358c14f9fb8fbd6465e21b8962 Mon Sep 17 00:00:00 2001 From: adityacp Date: Mon, 7 Sep 2020 12:53:08 +0530 Subject: Add edit and delete table of contents options --- yaksh/urls.py | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'yaksh/urls.py') diff --git a/yaksh/urls.py b/yaksh/urls.py index 2c462b3..d7fd410 100644 --- a/yaksh/urls.py +++ b/yaksh/urls.py @@ -241,18 +241,13 @@ urlpatterns = [ name='add_marker'), path('manage/add/lesson/topic///', views.add_topic, name='add_topic'), - path('manage/edit/lesson/topic////', - views.add_topic, name='edit_topic'), + path('manage/edit/lesson/topic////' + '/', views.add_topic, name='edit_topic'), path('manage/add/lesson/quiz///', views.add_marker_quiz, name='add_marker_quiz'), - path('manage/edit/lesson/quiz////', - views.add_marker_quiz, name='edit_marker_quiz'), - path('manage/add/lesson/exercise///', - views.add_marker_quiz, name='add_marker_quiz'), - path('manage/edit/lesson/exercise////', - views.add_marker_quiz, name='edit_marker_quiz'), - path('manage/add/lesson/poll///', - views.add_marker_quiz, name='add_marker_quiz'), - path('manage/edit/lesson/poll////', - views.add_marker_quiz, name='edit_marker_quiz') + path('manage/edit/lesson/quiz////' + '/', views.add_marker_quiz, + name='edit_marker_quiz'), + path('manage/remove/lesson/toc//', + views.delete_toc, name='delete_toc'), ] -- cgit From 28f9fc3fa8b6ad7866c7ef72f13883af7d6ab7e7 Mon Sep 17 00:00:00 2001 From: adityacp Date: Wed, 9 Sep 2020 17:07:21 +0530 Subject: Show the toc quiz on the student dashboard --- yaksh/urls.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'yaksh/urls.py') diff --git a/yaksh/urls.py b/yaksh/urls.py index e4f81e1..2b9a04f 100644 --- a/yaksh/urls.py +++ b/yaksh/urls.py @@ -259,4 +259,8 @@ urlpatterns = [ name='edit_marker_quiz'), path('manage/remove/lesson/toc//', views.delete_toc, name='delete_toc'), + path('get/marker/quiz//', views.get_marker_quiz, + name='get_marker_quiz'), + path('submit/marker/quiz//', + views.submit_marker_quiz, name='submit_marker_quiz'), ] -- cgit From b1d2b88746fc670d7362f9b4d175d5e570f3ac77 Mon Sep 17 00:00:00 2001 From: adityacp Date: Sat, 12 Sep 2020 11:44:01 +0530 Subject: Mulitple changes - Remove all alerts and add toast messages - Accept user submissions for the lesson quiz and evaluate - Initial lesson statistics --- 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 2b9a04f..ada5829 100644 --- a/yaksh/urls.py +++ b/yaksh/urls.py @@ -263,4 +263,6 @@ urlpatterns = [ name='get_marker_quiz'), path('submit/marker/quiz//', views.submit_marker_quiz, name='submit_marker_quiz'), + path('manage/lesson/stats//', + views.lessson_statistics, name='lessson_statistics'), ] -- cgit From 98908b86a94da4a2552564e057457c48b46d4ac3 Mon Sep 17 00:00:00 2001 From: adityacp Date: Mon, 14 Sep 2020 16:04:35 +0530 Subject: Show lesson quiz statistics --- yaksh/urls.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'yaksh/urls.py') diff --git a/yaksh/urls.py b/yaksh/urls.py index ada5829..7bd3182 100644 --- a/yaksh/urls.py +++ b/yaksh/urls.py @@ -264,5 +264,7 @@ urlpatterns = [ path('submit/marker/quiz//', views.submit_marker_quiz, name='submit_marker_quiz'), path('manage/lesson/stats//', - views.lessson_statistics, name='lessson_statistics'), + views.lesson_statistics, name='lesson_statistics'), + path('manage/lesson/stats///', + views.lesson_statistics, name='lesson_statistics'), ] -- cgit From c6c57869fe653d2ea0502017a9fb15f2f745491b Mon Sep 17 00:00:00 2001 From: adityacp Date: Wed, 30 Sep 2020 19:14:38 +0530 Subject: Change multiple files - Add download sample yaml for toc in the lesson - Add validation for upload toc yaml - Add tests for download sample yaml toc --- 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 7bd3182..b60b5f5 100644 --- a/yaksh/urls.py +++ b/yaksh/urls.py @@ -267,4 +267,6 @@ urlpatterns = [ views.lesson_statistics, name='lesson_statistics'), path('manage/lesson/stats///', views.lesson_statistics, name='lesson_statistics'), + path('manage/download/sample/toc', + views.download_sample_toc, name='download_sample_toc'), ] -- cgit From 5e49406420207123afec88a1ca7138e7a58c2acc Mon Sep 17 00:00:00 2001 From: CruiseDevice Date: Wed, 16 Sep 2020 07:23:36 +0530 Subject: Show Lesson post and comments in discussion forum - Use trash icon instead of DELETE button - Sidebar to navigate between course forum and lesson forum - Course forum displays all the questions (posts) linked with the course model, and Lesson forum displays all the questions (posts) linked with the Lesson model. --- yaksh/urls.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'yaksh/urls.py') diff --git a/yaksh/urls.py b/yaksh/urls.py index b60b5f5..82785ca 100644 --- a/yaksh/urls.py +++ b/yaksh/urls.py @@ -60,9 +60,11 @@ 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+)/$', + url(r'^forum/course_forum/(?P\d+)/$', views.course_forum, name='course_forum'), + url(r'^forum/lessons_forum/(?P\d+)/$', + views.lessons_forum, name='lessons_forum'), url(r'^forum/(?P\d+)/post/(?P[0-9a-f-]+)/$', views.post_comments, name='post_comments'), -- cgit From 054cb7a7d898cab8902dd6c97db4072b01bd2af9 Mon Sep 17 00:00:00 2001 From: prathamesh Date: Fri, 23 Oct 2020 03:55:43 +0530 Subject: Update marks using CSV file upload --- 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 82785ca..e716404 100644 --- a/yaksh/urls.py +++ b/yaksh/urls.py @@ -271,4 +271,6 @@ urlpatterns = [ views.lesson_statistics, name='lesson_statistics'), path('manage/download/sample/toc', views.download_sample_toc, name='download_sample_toc'), + path('manage/upload_marks///', + views.upload_marks, name='upload_marks'), ] -- cgit From eac52e0198000d96b4c84f9fa6b63ea50cc59f1d Mon Sep 17 00:00:00 2001 From: adityacp Date: Tue, 3 Nov 2020 11:32:26 +0530 Subject: Multiple changes - Add tinymce editor to the question description in lesson quiz - Fix katex rendering in the lesson quiz questions - Remove unncessary preview description view function - Keep the fixed height for the lesson table of contents div --- yaksh/urls.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'yaksh/urls.py') diff --git a/yaksh/urls.py b/yaksh/urls.py index 82785ca..f15d91a 100644 --- a/yaksh/urls.py +++ b/yaksh/urls.py @@ -199,8 +199,6 @@ urlpatterns = [ 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/lesson/preview/$', - views.preview_html_text, name="preview_html_text"), url(r'^manage/courses/add_module/(?P\d+)/$', views.add_module, name="add_module"), url(r'^manage/courses/add_module/(?P\d+)/(?P\d+)/$', -- cgit