From e1e334964aaaed89e7e6d85094048518cb7ad88c Mon Sep 17 00:00:00 2001 From: CruiseDevice Date: Sat, 8 Aug 2020 00:56:26 +0530 Subject: Add select all checkbox in design qp for fixed questions. --- yaksh/templates/yaksh/add_quiz.html | 2 +- yaksh/templates/yaksh/design_questionpaper.html | 72 +++++++++++++------------ 2 files changed, 40 insertions(+), 34 deletions(-) (limited to 'yaksh/templates') diff --git a/yaksh/templates/yaksh/add_quiz.html b/yaksh/templates/yaksh/add_quiz.html index 55e3bd6..01b6f8c 100644 --- a/yaksh/templates/yaksh/add_quiz.html +++ b/yaksh/templates/yaksh/add_quiz.html @@ -55,7 +55,7 @@ {% if quiz and course_id %} {% if quiz.questionpaper_set.get.id %}
- + Edit Question Paper diff --git a/yaksh/templates/yaksh/design_questionpaper.html b/yaksh/templates/yaksh/design_questionpaper.html index ffbdf5f..fcc3ed5 100644 --- a/yaksh/templates/yaksh/design_questionpaper.html +++ b/yaksh/templates/yaksh/design_questionpaper.html @@ -114,12 +114,47 @@

Select questions to add:

 +
+
+ + +
+
+

Fixed questions currently in paper:

+
+ {% if fixed_questions %}
    - {% for question in questions %} +
    Select All
    + {% for question in fixed_questions %}
    • {% endfor %} @@ -136,35 +171,6 @@

- -
-
-
-

Fixed questions currently in paper:

-
-
    - {% for question in fixed_questions %} -
  • - -
    • - {% endfor %} -
-
-
-
-- cgit From c77f0ca5616faa4e9426d610e38da1b6231346dc Mon Sep 17 00:00:00 2001 From: adityacp Date: Fri, 28 Aug 2020 08:24:54 +0530 Subject: Multiple changes - Fix a bug where user cannot submit zero as answer - Fix UI in question statistics - Fix a bug where the trial question paper was not updated --- yaksh/templates/yaksh/add_quiz.html | 12 ++++++------ yaksh/templates/yaksh/question.html | 4 ++-- yaksh/templates/yaksh/statistics_question.html | 24 ++++++++++++++---------- 3 files changed, 22 insertions(+), 18 deletions(-) (limited to 'yaksh/templates') diff --git a/yaksh/templates/yaksh/add_quiz.html b/yaksh/templates/yaksh/add_quiz.html index 55e3bd6..9b80e0d 100644 --- a/yaksh/templates/yaksh/add_quiz.html +++ b/yaksh/templates/yaksh/add_quiz.html @@ -55,7 +55,7 @@ {% if quiz and course_id %} {% if quiz.questionpaper_set.get.id %}
- + Edit Question Paper @@ -65,11 +65,11 @@

You can check the quiz by attempting it in the following modes:

 - User Mode + Try as student - - God Mode + + Try as teacher Help @@ -88,13 +88,13 @@

- User Mode: Attempt quiz the way normal users will attempt i.e. - + Try as student: Attempt quiz the way students will attempt i.e. -

- God Mode: Attempt quiz without any time or eligibilty constraints. + Try as teacher: Attempt quiz without any time or eligibilty constraints.

diff --git a/yaksh/templates/yaksh/question.html b/yaksh/templates/yaksh/question.html index ae2f9f4..6489b38 100644 --- a/yaksh/templates/yaksh/question.html +++ b/yaksh/templates/yaksh/question.html @@ -127,14 +127,14 @@ question_type = "{{ question.type }}"; - Note: {{ notification }} + {{ notification }} {% else %} {% endif %} {% else %} diff --git a/yaksh/templates/yaksh/statistics_question.html b/yaksh/templates/yaksh/statistics_question.html index 9a54501..52c29d3 100644 --- a/yaksh/templates/yaksh/statistics_question.html +++ b/yaksh/templates/yaksh/statistics_question.html @@ -1,9 +1,10 @@ {% extends "manage.html" %} +{% block title %} Question Statistics {% endblock %} {% block pagetitle %} Statistics for {{ quiz.description }}{% endblock pagetitle %} {% block content %} -
+
    @@ -18,16 +19,14 @@
    {% if question_stats %}

    Total number of participants: {{ total }}

    - - +
    QuestionTypeTotalAnswered Correctly
    + {% for question, value in question_stats.items %} - + -- cgit From 348a6a5b0786ffc28cb988c1fcc62232a7e57fc2 Mon Sep 17 00:00:00 2001 From: adityacp Date: Fri, 28 Aug 2020 12:49:32 +0530 Subject: Release changes --- yaksh/templates/yaksh/question.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'yaksh/templates') diff --git a/yaksh/templates/yaksh/question.html b/yaksh/templates/yaksh/question.html index 6489b38..3f7e67e 100644 --- a/yaksh/templates/yaksh/question.html +++ b/yaksh/templates/yaksh/question.html @@ -239,21 +239,21 @@ question_type = "{{ question.type }}"; {% if question.type == "integer" %} Enter Integer:
    - +

    {% endif %} {% if question.type == "string" %} Enter Text:
    - +

    {% endif %} {% if question.type == "float" %} Enter Decimal Value :
    - +

    {% endif %} -- cgit From 44b64f9ad0f0618d15ee99026a33df14937d3ef4 Mon Sep 17 00:00:00 2001 From: prathamesh Date: Tue, 8 Sep 2020 02:49:24 +0530 Subject: Provide additional attempt to a selected student or extend time. --- yaksh/templates/yaksh/micromanaged.html | 22 ++++++++++++++++++++++ yaksh/templates/yaksh/micromonitor.html | 9 +++++++++ yaksh/templates/yaksh/monitor.html | 31 ++++++++++++++++++++++++++++--- yaksh/templates/yaksh/quit.html | 4 ++++ yaksh/templates/yaksh/quizzes_user.html | 2 ++ 5 files changed, 65 insertions(+), 3 deletions(-) create mode 100644 yaksh/templates/yaksh/micromanaged.html create mode 100644 yaksh/templates/yaksh/micromonitor.html (limited to 'yaksh/templates') diff --git a/yaksh/templates/yaksh/micromanaged.html b/yaksh/templates/yaksh/micromanaged.html new file mode 100644 index 0000000..336feec --- /dev/null +++ b/yaksh/templates/yaksh/micromanaged.html @@ -0,0 +1,22 @@ +{% if micromanagers %} +
    +
    + {% for micromanager in micromanagers %} + {% if micromanager.attempts_permitted > 0 %} +
    +

    You have been given a special attempt to the {{ micromanager.quiz.description }} by the course creator

    +
    +
    + {% if micromanager.can_student_attempt %} + + Start Special Attempt + + {% else %} + Exhausted + {% endif %} +
    + {% endif %} + {% endfor %} +{% endif %} +
    + diff --git a/yaksh/templates/yaksh/micromonitor.html b/yaksh/templates/yaksh/micromonitor.html new file mode 100644 index 0000000..cc059aa --- /dev/null +++ b/yaksh/templates/yaksh/micromonitor.html @@ -0,0 +1,9 @@ +{% if micromanager %} + {% if micromanager.can_student_attempt %} + Revoke + {% else %} + Allow + {% endif %} +{% else %} + Allow +{% endif %} diff --git a/yaksh/templates/yaksh/monitor.html b/yaksh/templates/yaksh/monitor.html index ef7b033..183ba99 100644 --- a/yaksh/templates/yaksh/monitor.html +++ b/yaksh/templates/yaksh/monitor.html @@ -74,6 +74,18 @@ $(document).ready(function()
    +
    + {% if messages %} + {% for message in messages %} +
    + + {{ message }} +
    + {% endfor %} + {% endif %} +
    @@ -102,8 +114,9 @@ $(document).ready(function()
    - + + @@ -118,7 +131,20 @@ $(document).ready(function() - + + {% endfor %} @@ -126,7 +152,6 @@ $(document).ready(function()
    QuestionTypeTotalAnswered Correctly
    {{ question.summary }} - + {{ question.summary }}
    -
    +
    +
    Summary: @@ -38,7 +37,7 @@ Description:

    - {{ question.description }} + {{ question.description|safe }}

    Points: @@ -50,7 +49,7 @@ Type:

    - {{ question.type }} + {{ question.get_type_display }}

    {% if question.type in 'mcq mcc' %} @@ -72,6 +71,11 @@
    		+ + {{ question.type }} {{value.1}}{{ value.0 }} ({% widthratio value.0 value.1 100 %}%) Institute  Marks  Attempts  Time  Time Left  Status  Special Attempt 
    {{ paper.marks_obtained }} {{ paper.answers.count }} {{ paper.time_left }} {{ paper.status }} {% if paper.is_attempt_inprogress %} +
    + {% csrf_token %} +
    + + +
    + +
    + {% else %} + Completed + {% endif %} +     		{% specail_attempt_monitor paper.user.id course.id quiz.id %}