From 51c6734d53e9fdb79500782992a74287f9bae259 Mon Sep 17 00:00:00 2001 From: adityacp Date: Tue, 20 Feb 2018 11:47:38 +0530 Subject: Change in complete.html and courses.html - Remove message from complete.html - Add/Change link for clone course --- yaksh/templates/yaksh/complete.html | 3 --- yaksh/templates/yaksh/courses.html | 21 ++++++++++++++++++--- 2 files changed, 18 insertions(+), 6 deletions(-) (limited to 'yaksh/templates') diff --git a/yaksh/templates/yaksh/complete.html b/yaksh/templates/yaksh/complete.html index e4317fe..19013ca 100644 --- a/yaksh/templates/yaksh/complete.html +++ b/yaksh/templates/yaksh/complete.html @@ -33,9 +33,6 @@ width="80" alt="YAKSH">{% endblock %}

{{message}}


- {% if not module_id %} -

You may now close the browser.


- {% endif %} Home {% if module_id and not user == "moderator" %} {% if first_unit %} diff --git a/yaksh/templates/yaksh/courses.html b/yaksh/templates/yaksh/courses.html index a1fd48a..afd53d7 100644 --- a/yaksh/templates/yaksh/courses.html +++ b/yaksh/templates/yaksh/courses.html @@ -4,6 +4,7 @@ {% block script %} {% endblock %} +{% block css %} + +{% endblock %} {% block content %}
@@ -99,7 +108,8 @@

@@ -259,7 +274,7 @@
  • - + Clone 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/templates/yaksh/courses.html | 6 +++--- yaksh/templates/yaksh/design_course_session.html | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'yaksh/templates') diff --git a/yaksh/templates/yaksh/courses.html b/yaksh/templates/yaksh/courses.html index 9c00957..b19f094 100644 --- a/yaksh/templates/yaksh/courses.html +++ b/yaksh/templates/yaksh/courses.html @@ -133,12 +133,12 @@
  • - + Copy Course

  • - + Clone Course
    • @@ -274,7 +274,7 @@
  • - + Clone Course
    • diff --git a/yaksh/templates/yaksh/design_course_session.html b/yaksh/templates/yaksh/design_course_session.html index ee530e0..6542e3c 100644 --- a/yaksh/templates/yaksh/design_course_session.html +++ b/yaksh/templates/yaksh/design_course_session.html @@ -23,7 +23,7 @@
    -

    Available Lessons and quizzes: (Add Lessons and Quizzes)

    +

    Available Modules:

    @@ -64,7 +64,7 @@
    -

    Choosen Lessons and quizzes:

    +

    Choosen Modules:

    -- 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/templates/yaksh/courses.html | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'yaksh/templates') diff --git a/yaksh/templates/yaksh/courses.html b/yaksh/templates/yaksh/courses.html index b19f094..78d21bf 100644 --- a/yaksh/templates/yaksh/courses.html +++ b/yaksh/templates/yaksh/courses.html @@ -133,12 +133,7 @@
  • - - Copy Course -
    • -
    -
  • - + Clone Course
    • @@ -274,7 +269,7 @@
  • - + Clone Course
    • -- cgit From 3bbaff2ebca026042cce3deb025effb9e83e0859 Mon Sep 17 00:00:00 2001 From: adityacp Date: Wed, 28 Feb 2018 16:54:22 +0530 Subject: Change forms.py, models.py, test_models.py and templates - Add help text for timezone field in user registration form - Add new method in course model to get days remaining to start a course - Show start time and end time of a course to the students - Disallow to enroll to a course which is not active - Add model test for the new course method --- yaksh/templates/yaksh/course_modules.html | 166 +++++++++++++++--------------- yaksh/templates/yaksh/quizzes_user.html | 35 +++++-- yaksh/templates/yaksh/view_profile.html | 4 + 3 files changed, 113 insertions(+), 92 deletions(-) (limited to 'yaksh/templates') diff --git a/yaksh/templates/yaksh/course_modules.html b/yaksh/templates/yaksh/course_modules.html index fad1be0..afbae75 100644 --- a/yaksh/templates/yaksh/course_modules.html +++ b/yaksh/templates/yaksh/course_modules.html @@ -18,102 +18,100 @@ {% endif %} {% if learning_modules %} - {% for module in learning_modules %} -
    -
    - - - - - -
    - - {{module.name|title}} - - - - - - View Lessons/Quizzes/Exercises - - {% get_module_status user module course as module_status %} - Status: - {% if module_status == "completed" %} - - {{module_status|title}} - - {% elif module_status == "inprogress" %} - - {{module_status|title}} - - {% else %} - - {{module_status|title}} - - {% endif %} -
    -
    -
    - - - - - - - - {% for unit in module.get_learning_units %} +
    Lesson/Quiz/ExerciseStatusTypeView AnswerPaper
    + {% for module in learning_modules %} -
    - - - {% endfor %} -
    - {% if unit.type == "quiz" %} - {{unit.quiz.description}} - {% else %} - {{unit.lesson.name}} - {% endif %} + + {{module.name|title}} - {% get_unit_status course module unit user as status %} - {% if status == "completed" %} - {{status|title}} + - {% elif status == "inprogress" %} - {{status|title}} + - {% else %} - {{status|title}} - - {% endif %} - - {% if unit.type == "quiz" %} - {% if unit.quiz.is_exercise %} - Exercise - {% else %} - Quiz - {% endif %} - {% else %} - Lesson - {% endif %} + + View Lessons/Quizzes/Exercises +
    + + + + + + + + {% for unit in module.get_learning_units %} + + + + + + + {% endfor %} +
    Lesson/Quiz/ExerciseStatusTypeView AnswerPaper
    + {% if unit.type == "quiz" %} + {{unit.quiz.description}} + {% else %} + {{unit.lesson.name}} + {% endif %} + + {% get_unit_status course module unit user as status %} + {% if status == "completed" %} + {{status|title}} + + {% elif status == "inprogress" %} + {{status|title}} + + {% else %} + {{status|title}} + + {% endif %} + + {% if unit.type == "quiz" %} + {% if unit.quiz.is_exercise %} + Exercise + {% else %} + Quiz + {% endif %} + {% else %} + Lesson + {% endif %} + + {% if unit.type == "quiz" %} + {% if unit.quiz.view_answerpaper %} + + Can View + {% else %} + + Cannot view now + {% endif %} + {% else %} + ------ + {% endif %} +
    +
    		- {% if unit.type == "quiz" %} - {% if unit.quiz.view_answerpaper %} - Can View + {% get_module_status user module course as module_status %} + Status: + {% if module_status == "completed" %} + + {{module_status|title}} + + {% elif module_status == "inprogress" %} + + {{module_status|title}} + {% else %} - - Cannot view now + + {{module_status|title}} + {% endif %} - {% else %} - ------ - {% endif %}
    -
    - {% endfor %} + {% endfor %} + {% else %}

    No lectures found

    {% endif %} diff --git a/yaksh/templates/yaksh/quizzes_user.html b/yaksh/templates/yaksh/quizzes_user.html index cf08752..05af528 100644 --- a/yaksh/templates/yaksh/quizzes_user.html +++ b/yaksh/templates/yaksh/quizzes_user.html @@ -39,25 +39,44 @@ No Courses to display
    - {% if not course.active %} - Closed - {% endif %} {% if user in course.requests.all %} Request Pending {% elif user in course.rejected.all %}Request Rejected {% elif user in course.students.all %}Enrolled {% else %} - {% if course.is_active_enrollment %} - {% if course.is_self_enroll %} - Enroll + {% if course.active %} + {% if course.is_active_enrollment %} + {% if course.is_self_enroll %} + Enroll + {% else %} + Enroll + {% endif %} {% else %} - Enroll + + Enrollment Closed + {% endif %} {% else %} - Enrollment Closed + + Course is not activated + {% endif %} {% endif %}
    +
    + {% if course.days_remain_to_start != 0 %} + + {{course.days_remain_to_start}} day(s) to start + + {% endif %} +
    + {% if course.is_active_enrollment %} +
    + Start Date : {{course.start_enroll_time}} +
    + End Date  : {{course.end_enroll_time}} +
    + {% endif %} {% if course.instructions %}
    diff --git a/yaksh/templates/yaksh/view_profile.html b/yaksh/templates/yaksh/view_profile.html index 5f06135..ce95226 100644 --- a/yaksh/templates/yaksh/view_profile.html +++ b/yaksh/templates/yaksh/view_profile.html @@ -31,6 +31,10 @@ + + + + Edit Profile {% endblock %} -- 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/templates/yaksh/download_questionpaper.html | 38 +++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 yaksh/templates/yaksh/download_questionpaper.html (limited to 'yaksh/templates') diff --git a/yaksh/templates/yaksh/download_questionpaper.html b/yaksh/templates/yaksh/download_questionpaper.html new file mode 100644 index 0000000..8b04874 --- /dev/null +++ b/yaksh/templates/yaksh/download_questionpaper.html @@ -0,0 +1,38 @@ +{% extends "base.html" %} + +{% block pagetitle %} Quiz: {{ paper.quiz.description }} {% endblock pagetitle %} + +{% block content %} +
    +
    +
    Maximum Mark(s): {{ paper.total_marks }}
    +
    Total Time: {{ paper.quiz.duration }}
    +
    +
    +
    +
    Instructions
    +
    + {{ paper.quiz.instructions|safe }} +
    +
    +{% for question in questions %} +
    +
    + {{forloop.counter}}. {{ question.summary }} + Mark(s): {{ question.points }} + +
    +
    +
    Question:
    {{ question.description|safe }} + {% if question.type == "mcq" or question.type == "mcc" %} +
    Choices:
    + {% for testcase in question.get_test_cases %} +
    + {{ forloop.counter }}. {{ testcase.options|safe }} + {% endfor %} + {% endif %} + +
    +
    +{% endfor %} +{% endblock %} -- 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/templates/yaksh/download_questionpaper.html | 38 -------------------- yaksh/templates/yaksh/preview_questionpaper.html | 42 +++++++++++++++++++++++ 2 files changed, 42 insertions(+), 38 deletions(-) delete mode 100644 yaksh/templates/yaksh/download_questionpaper.html create mode 100644 yaksh/templates/yaksh/preview_questionpaper.html (limited to 'yaksh/templates') diff --git a/yaksh/templates/yaksh/download_questionpaper.html b/yaksh/templates/yaksh/download_questionpaper.html deleted file mode 100644 index 8b04874..0000000 --- a/yaksh/templates/yaksh/download_questionpaper.html +++ /dev/null @@ -1,38 +0,0 @@ -{% extends "base.html" %} - -{% block pagetitle %} Quiz: {{ paper.quiz.description }} {% endblock pagetitle %} - -{% block content %} -
    -
    -
    Maximum Mark(s): {{ paper.total_marks }}
    -
    Total Time: {{ paper.quiz.duration }}
    -
    -
    -
    -
    Instructions
    -
    - {{ paper.quiz.instructions|safe }} -
    -
    -{% for question in questions %} -
    -
    - {{forloop.counter}}. {{ question.summary }} - Mark(s): {{ question.points }} - -
    -
    -
    Question:
    {{ question.description|safe }} - {% if question.type == "mcq" or question.type == "mcc" %} -
    Choices:
    - {% for testcase in question.get_test_cases %} -
    - {{ forloop.counter }}. {{ testcase.options|safe }} - {% endfor %} - {% endif %} - -
    -
    -{% endfor %} -{% endblock %} diff --git a/yaksh/templates/yaksh/preview_questionpaper.html b/yaksh/templates/yaksh/preview_questionpaper.html new file mode 100644 index 0000000..411e4a6 --- /dev/null +++ b/yaksh/templates/yaksh/preview_questionpaper.html @@ -0,0 +1,42 @@ +{% extends "base.html" %} + +{% block pagetitle %} Quiz: {{ paper.quiz.description }} {% endblock pagetitle %} + +{% block content %} +
    +
    +
    Maximum Mark(s): {{ paper.total_marks }}
    +
    Total Time: {{ paper.quiz.duration }}
    +
    +
    +
    +
    Instructions
    +
    + {{ paper.quiz.instructions|safe }} +
    +
    +{% for question in questions %} +
    +
    + {{forloop.counter}}. {{ question.summary }} + Mark(s): {{ question.points }} + +
    +
    +
    Question:
    {{ question.description|safe }} +
    Answer:
    + {% if question.type == "code" %} +
    {{ question.snippet }}
    + {% endif %} + {% if question.type == "mcq" or question.type == "mcc" %} +
    Choices:
    + {% for testcase in question.get_test_cases %} +
    + {{ forloop.counter }}. {{ testcase.options|safe }} + {% endfor %} + {% endif %} + +
    +
    +{% endfor %} +{% endblock %} -- cgit From 73d6da4bca9b604a3fe68b8ce843791c948ae285 Mon Sep 17 00:00:00 2001 From: ankitjavalkar Date: Tue, 6 Mar 2018 12:05:43 +0530 Subject: Add view button to preview the questionpaper --- yaksh/templates/yaksh/courses.html | 3 +++ 1 file changed, 3 insertions(+) (limited to 'yaksh/templates') diff --git a/yaksh/templates/yaksh/courses.html b/yaksh/templates/yaksh/courses.html index bc96bf5..c20f5df 100644 --- a/yaksh/templates/yaksh/courses.html +++ b/yaksh/templates/yaksh/courses.html @@ -358,6 +358,9 @@ {% if quiz.questionpaper_set.get %} Question Paper for {{ quiz.description }} + + View +
    {% else %}

    No Question Paper -- cgit From 88fbad3f08dfcf8d139f8bc572860469c64e3104 Mon Sep 17 00:00:00 2001 From: ankitjavalkar Date: Tue, 6 Mar 2018 20:47:42 +0530 Subject: Multiple fixes: - Add views test cases in test_views.py - Add minutes unit to preview_questionpaper template - Add error handling in views when random user accesses questionpaper --- yaksh/templates/yaksh/preview_questionpaper.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'yaksh/templates') diff --git a/yaksh/templates/yaksh/preview_questionpaper.html b/yaksh/templates/yaksh/preview_questionpaper.html index 411e4a6..123218f 100644 --- a/yaksh/templates/yaksh/preview_questionpaper.html +++ b/yaksh/templates/yaksh/preview_questionpaper.html @@ -6,7 +6,7 @@

    Maximum Mark(s): {{ paper.total_marks }}
    -
    Total Time: {{ paper.quiz.duration }}
    +
    Total Time: {{ paper.quiz.duration }} minutes
    -- cgit From b0df46ec36a043d3c51014cf5746d7def9cb17b9 Mon Sep 17 00:00:00 2001 From: adityacp Date: Thu, 8 Mar 2018 14:34:17 +0530 Subject: Change model method name in course model --- yaksh/templates/yaksh/quizzes_user.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'yaksh/templates') diff --git a/yaksh/templates/yaksh/quizzes_user.html b/yaksh/templates/yaksh/quizzes_user.html index 05af528..49f8d2d 100644 --- a/yaksh/templates/yaksh/quizzes_user.html +++ b/yaksh/templates/yaksh/quizzes_user.html @@ -63,9 +63,9 @@ No Courses to display {% endif %}
    - {% if course.days_remain_to_start != 0 %} + {% if course.days_before_start != 0 %} - {{course.days_remain_to_start}} day(s) to start + {{course.days_before_start}} day(s) to start {% endif %}
    -- cgit From 9c5464a6edaaf2aaafc0e42fe88c8734fd952e12 Mon Sep 17 00:00:00 2001 From: mahesh Date: Mon, 15 Jan 2018 17:40:06 +0530 Subject: Add shuffle testcases option to questions --- yaksh/templates/yaksh/add_question.html | 1 + 1 file changed, 1 insertion(+) (limited to 'yaksh/templates') diff --git a/yaksh/templates/yaksh/add_question.html b/yaksh/templates/yaksh/add_question.html index ed69657..b02487c 100644 --- a/yaksh/templates/yaksh/add_question.html +++ b/yaksh/templates/yaksh/add_question.html @@ -29,6 +29,7 @@ Snippet: {{ qform.snippet }} Minimum Time(in minutes): {{ qform.min_time }} Partial Grading: {{ qform.partial_grading }} + Shuffle Testcases: {{ qform.shuffle_testcases }} Grade Assignment Upload: {{ qform.grade_assignment_upload }} File: {{ fileform.file_field }}{{ fileform.file_field.errors }} {% if uploaded_files %}
    Uploaded files:
    Check on delete to delete files, -- cgit From 7fc24f1d4fe9208867ab38d600fa35a3c7b31386 Mon Sep 17 00:00:00 2001 From: mahesh Date: Tue, 16 Jan 2018 01:13:49 +0530 Subject: Add test case order in view_answerpaper --- yaksh/templates/yaksh/view_answerpaper.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'yaksh/templates') diff --git a/yaksh/templates/yaksh/view_answerpaper.html b/yaksh/templates/yaksh/view_answerpaper.html index 410b578..971ef77 100644 --- a/yaksh/templates/yaksh/view_answerpaper.html +++ b/yaksh/templates/yaksh/view_answerpaper.html @@ -34,7 +34,7 @@ Start time: {{ paper.start_time }}
    End time : {{ paper.end_time }}
    Percentage obtained: {{ paper.percent }}%
    - {% if paper.passed == 0 %} + {% if paper.passed %} Status : Failed
    {% else %} Status : Passed
    @@ -55,7 +55,8 @@
    Question:
    {{ question.description|safe }} {% if question.type == "mcq" or question.type == "mcc" %}
    Choices:
    - {% for testcase in question.get_test_cases %} + {% get_ordered_testcases question paper as testcases %} + {% for testcase in testcases %} {% if testcase.correct %}
    {{ forloop.counter }}. {{ testcase.options|safe }} -- cgit From 140b6c6a06269cc39eae192605f623c7818e9260 Mon Sep 17 00:00:00 2001 From: mahesh Date: Fri, 16 Feb 2018 16:30:55 +0530 Subject: Add shuffle_testcases to QuestionPaper model instead of Question --- yaksh/templates/yaksh/add_question.html | 1 - yaksh/templates/yaksh/design_questionpaper.html | 8 ++++++-- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'yaksh/templates') diff --git a/yaksh/templates/yaksh/add_question.html b/yaksh/templates/yaksh/add_question.html index b02487c..ed69657 100644 --- a/yaksh/templates/yaksh/add_question.html +++ b/yaksh/templates/yaksh/add_question.html @@ -29,7 +29,6 @@ Snippet: {{ qform.snippet }} Minimum Time(in minutes): {{ qform.min_time }} Partial Grading: {{ qform.partial_grading }} - Shuffle Testcases: {{ qform.shuffle_testcases }} Grade Assignment Upload: {{ qform.grade_assignment_upload }} File: {{ fileform.file_field }}{{ fileform.file_field.errors }} {% if uploaded_files %}
    Uploaded files:
    Check on delete to delete files, diff --git a/yaksh/templates/yaksh/design_questionpaper.html b/yaksh/templates/yaksh/design_questionpaper.html index 1656e2b..d982d27 100644 --- a/yaksh/templates/yaksh/design_questionpaper.html +++ b/yaksh/templates/yaksh/design_questionpaper.html @@ -192,10 +192,14 @@ select
    -
    Almost finished creating your question paper
    +
    Almost finished creating your question paper


    +


    -- cgit From 4a5463d753c9af41d85a6be33257012c17d2ab15 Mon Sep 17 00:00:00 2001 From: mahesh Date: Tue, 20 Feb 2018 12:41:59 +0530 Subject: TestCaseOrder created only mcc/mcq questions --- yaksh/templates/yaksh/user_data.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'yaksh/templates') diff --git a/yaksh/templates/yaksh/user_data.html b/yaksh/templates/yaksh/user_data.html index 45867d2..ce2533e 100644 --- a/yaksh/templates/yaksh/user_data.html +++ b/yaksh/templates/yaksh/user_data.html @@ -74,8 +74,7 @@ User IP address: {{ paper.user_ip }} {% endif %} {% endfor %} - {% elif question.type == "integer" or question.type == "string" - or question.type == "float" %} + {% elif question.type == "integer" or question.type == "string" or question.type == "float" %}
    Correct Answer:
    {% for testcase in question.get_test_cases %} {{ testcase.correct|safe }} -- cgit