From 20a630bee1db9b2df6f0a820de40fe97d0703064 Mon Sep 17 00:00:00 2001 From: maheshgudi Date: Fri, 17 Nov 2017 17:54:22 +0530 Subject: Position cursor automatically on text area during quiz --- yaksh/templates/yaksh/question.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'yaksh/templates') diff --git a/yaksh/templates/yaksh/question.html b/yaksh/templates/yaksh/question.html index af24778..83ee16b 100644 --- a/yaksh/templates/yaksh/question.html +++ b/yaksh/templates/yaksh/question.html @@ -165,19 +165,19 @@ lang = "{{ question.language }}" {% if question.type == "integer" %} Enter Integer:
- +

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

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

{% endif %} @@ -207,7 +207,7 @@ lang = "{{ question.language }}" Undo Changes  - +
{% endif %}
-- cgit From 7e2972786599fc23c436e593fcc236defd93c88c Mon Sep 17 00:00:00 2001 From: maheshgudi Date: Wed, 22 Nov 2017 20:49:07 +0530 Subject: Display error output without reloading. --- yaksh/templates/exam.html | 83 ++--------------------------------------------- 1 file changed, 3 insertions(+), 80 deletions(-) (limited to 'yaksh/templates') diff --git a/yaksh/templates/exam.html b/yaksh/templates/exam.html index a1f0df4..f722c5f 100644 --- a/yaksh/templates/exam.html +++ b/yaksh/templates/exam.html @@ -82,86 +82,9 @@

{% if question.type == 'code' or question.type == 'upload' %} - {% if error_message %} -
- {% for error in error_message %} -
-
Error No. {{ forloop.counter }}
-
-
- {% if not error.type %} - 
 {{error|safe}}
- {% elif error.type == 'assertion' %} - {% if error.test_case %} - We tried your code with the following test case:

- 
{{error.test_case}}
- {% endif %} -

The following error took place:

- - - - - - - - - - - {% if error.traceback %} - - - {% endif %} - -
Exception Name: {{error.exception}}
Exception Message: {{error.message}}
Full Traceback: 
{{error.traceback}}
- {% elif error.type == 'stdio' %} - {% if error.given_input %} - - - - - - -
For given Input value(s):{{error.given_input}}
- {% endif %} - - - - - - - - - - - - {% for expected,user in error.expected_output|zip:error.user_output %} - - - - {% if forloop.counter0 in error.error_line_numbers or not expected or not user %} - - {% else %} - - {% endif %} - - {% endfor %} -
Line No.
Expected Output
User output
Status
{{forloop.counter}} {{expected|default:""}} {{user|default:""}}
- - - - - - -
Error:{{error.error_msg}}
- - {% endif %} -
-
-
- {% endfor %} - -
- {% endif %} +
+
+ {% endif %} -- cgit From ae4e2dad126535cda41a7b4a05fdb247f9cdf737 Mon Sep 17 00:00:00 2001 From: mahesh Date: Thu, 23 Nov 2017 01:11:59 +0530 Subject: Render error output with django template instead of javascript --- yaksh/templates/exam.html | 16 +----- yaksh/templates/yaksh/error_template.html | 93 +++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+), 13 deletions(-) create mode 100644 yaksh/templates/yaksh/error_template.html (limited to 'yaksh/templates') diff --git a/yaksh/templates/exam.html b/yaksh/templates/exam.html index f722c5f..fede185 100644 --- a/yaksh/templates/exam.html +++ b/yaksh/templates/exam.html @@ -33,15 +33,6 @@ {% endblock %} {% block content %} -

Question Navigator

@@ -80,13 +71,12 @@ {% block main %} {% endblock %}
+

+ {% if question.type == 'code' or question.type == 'upload' %} -
-
- +
{% endif %} - diff --git a/yaksh/templates/yaksh/error_template.html b/yaksh/templates/yaksh/error_template.html new file mode 100644 index 0000000..d42a259 --- /dev/null +++ b/yaksh/templates/yaksh/error_template.html @@ -0,0 +1,93 @@ +{% block css%} + +{% endblock %} + +{% load custom_filters %} + +{% if error_message %} +
+ {% for error in error_message %} + +
+
Error No. {{ forloop.counter }}
+
+
+ {% if not error.type %} + 
 {{error|safe}}
+ + {% elif error.type == 'assertion' %} + + {% if error.test_case %} + We tried your code with the following test case: +

+ 

+          {{error.test_case}}
+
+ {% endif %} +

The following error took place:

+ + + + + + + + + + + {% if error.traceback %} + + + {% endif %} + +
Exception Name: {{error.exception}}
Exception Message: {{error.message}}
Full Traceback: 
{{error.traceback}}
+ + {% elif error.type == 'stdio' %} + + {% if error.given_input %} + + + + + + +
For given Input value(s):{{error.given_input}}
+ {% endif %} + + + + + + + + + + + + + {% for expected,user in error.expected_output|zip:error.user_output %} + + + + {% if forloop.counter0 in error.error_line_numbers or not expected or not user %} + + {% else %} + + {% endif %} + + {% endfor %} +
Line No.
Expected Output
User output
Status
{{forloop.counter}} {{expected|default:""}} {{user|default:""}}
+ + + + + + +
Error:{{error.error_msg}}
+ {% endif %} +
+
+
+ {% endfor %} +
+{% endif %} \ No newline at end of file -- cgit From c5469243a3357a030af0047dac90ae8fbbb77e85 Mon Sep 17 00:00:00 2001 From: maheshgudi Date: Thu, 23 Nov 2017 12:59:25 +0530 Subject: Minor changes in requesthandler.js --- yaksh/templates/exam.html | 2 +- yaksh/templates/yaksh/error_template.html | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'yaksh/templates') diff --git a/yaksh/templates/exam.html b/yaksh/templates/exam.html index fede185..63c31d6 100644 --- a/yaksh/templates/exam.html +++ b/yaksh/templates/exam.html @@ -73,11 +73,11 @@
- {% if question.type == 'code' or question.type == 'upload' %}
{% endif %} + {% endblock %} diff --git a/yaksh/templates/yaksh/error_template.html b/yaksh/templates/yaksh/error_template.html index d42a259..61657ae 100644 --- a/yaksh/templates/yaksh/error_template.html +++ b/yaksh/templates/yaksh/error_template.html @@ -5,7 +5,6 @@ {% load custom_filters %} {% if error_message %} -
{% for error in error_message %}
@@ -89,5 +88,4 @@
{% endfor %} - {% endif %} \ No newline at end of file -- cgit From e69b7bffb7a21ebd6468ae77ad462c7b85184f1a Mon Sep 17 00:00:00 2001 From: adityacp Date: Thu, 23 Nov 2017 10:46:00 +0530 Subject: Change urls, views, template, test_views - Fix view answer paper for student - Fix existing views test cases --- 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 3c4b985..26e550d 100644 --- a/yaksh/templates/yaksh/quizzes_user.html +++ b/yaksh/templates/yaksh/quizzes_user.html @@ -97,8 +97,8 @@ No Courses to display {% if unit.learning_type == "quiz" %} - {% if quiz.view_answerpaper %} - Can View + {% if unit.quiz.view_answerpaper %} + Can View {% else %} Cannot view now {% endif %} -- cgit From ae2e61692b417f243d8c97c1e766e12a5a980980 Mon Sep 17 00:00:00 2001 From: adityacp Date: Thu, 23 Nov 2017 12:11:11 +0530 Subject: Change template to avoid overlapping of html body with sidebar --- yaksh/templates/yaksh/show_video.html | 2 ++ 1 file changed, 2 insertions(+) (limited to 'yaksh/templates') diff --git a/yaksh/templates/yaksh/show_video.html b/yaksh/templates/yaksh/show_video.html index ffb0c68..8191f49 100644 --- a/yaksh/templates/yaksh/show_video.html +++ b/yaksh/templates/yaksh/show_video.html @@ -45,6 +45,7 @@
{{msg}}
{% endif %} +
{% if state == "module" %}
@@ -71,4 +72,5 @@
{% endif %} +
{% endblock %} \ No newline at end of file -- cgit From 252449b7b96d73548f53ecd0c3256aa0e777d1dd Mon Sep 17 00:00:00 2001 From: maheshgudi Date: Thu, 23 Nov 2017 13:54:47 +0530 Subject: Put page footer outside div container --- yaksh/templates/base.html | 2 +- yaksh/templates/exam.html | 9 +-------- yaksh/templates/yaksh/question.html | 14 +++++++++----- 3 files changed, 11 insertions(+), 14 deletions(-) (limited to 'yaksh/templates') diff --git a/yaksh/templates/base.html b/yaksh/templates/base.html index e7cc15c..3302482 100644 --- a/yaksh/templates/base.html +++ b/yaksh/templates/base.html @@ -52,6 +52,7 @@ {% block content %} {% endblock %}
+ - diff --git a/yaksh/templates/exam.html b/yaksh/templates/exam.html index 63c31d6..6589bb5 100644 --- a/yaksh/templates/exam.html +++ b/yaksh/templates/exam.html @@ -66,18 +66,11 @@

Question(s) left: {{ paper.questions_left }}

-
{% block main %} {% endblock %}
-
-
- {% if question.type == 'code' or question.type == 'upload' %} -
- {% endif %}
- - + {% endblock %} diff --git a/yaksh/templates/yaksh/question.html b/yaksh/templates/yaksh/question.html index af24778..c1e0e9a 100644 --- a/yaksh/templates/yaksh/question.html +++ b/yaksh/templates/yaksh/question.html @@ -227,12 +227,16 @@ lang = "{{ question.language }}" {% if question in paper.get_questions_unanswered %} {% endif %} - - - - + {% endif %} + - {% endif %} + + + +
+ {% if question.type == 'code' or question.type == 'upload' %} +
+ {% endif %}
-- cgit From e6a8284696d2092a398ebd3567e835cb790d792f Mon Sep 17 00:00:00 2001 From: adityacp Date: Tue, 28 Nov 2017 12:36:24 +0530 Subject: Change template to display error messages and change design and urls redirection --- yaksh/templates/yaksh/complete.html | 2 +- yaksh/templates/yaksh/question.html | 6 +++--- yaksh/templates/yaksh/quit.html | 2 +- yaksh/templates/yaksh/show_video.html | 5 +++-- 4 files changed, 8 insertions(+), 7 deletions(-) (limited to 'yaksh/templates') diff --git a/yaksh/templates/yaksh/complete.html b/yaksh/templates/yaksh/complete.html index c99b8f0..6c0d878 100644 --- a/yaksh/templates/yaksh/complete.html +++ b/yaksh/templates/yaksh/complete.html @@ -5,7 +5,7 @@ {% csrf_token %} {% if paper.questions_answered.all or paper.questions_unanswered.all %}
- + diff --git a/yaksh/templates/yaksh/question.html b/yaksh/templates/yaksh/question.html index 186a40b..674fafc 100644 --- a/yaksh/templates/yaksh/question.html +++ b/yaksh/templates/yaksh/question.html @@ -106,15 +106,15 @@ module_id = "{{module.id}}" {% get_unit_status course module unit user as status %} {% if unit.quiz.id == paper.question_paper.quiz.id %} - + {% endif %} {% if unit.learning_type == "quiz" %} - + {{ unit.quiz.description }} {% else %} - + {{ unit.lesson.name }} {% endif %} diff --git a/yaksh/templates/yaksh/quit.html b/yaksh/templates/yaksh/quit.html index b168724..b38c21e 100644 --- a/yaksh/templates/yaksh/quit.html +++ b/yaksh/templates/yaksh/quit.html @@ -3,7 +3,7 @@ {% block pagetitle %} Yaksh Online Test {% endblock %} {% block content %}

Submission Status

Submission Status
Question
- + diff --git a/yaksh/templates/yaksh/show_video.html b/yaksh/templates/yaksh/show_video.html index 8191f49..ff79808 100644 --- a/yaksh/templates/yaksh/show_video.html +++ b/yaksh/templates/yaksh/show_video.html @@ -23,7 +23,7 @@ {{ unit.quiz.description }} {% else %} - + {{ unit.lesson.name }} {% endif %} @@ -42,7 +42,8 @@ {% block main %} {% if msg %}
-
{{msg}}
+
+
{{msg}}
{% endif %}
-- cgit
Submission Status

Submission Status
Question