summaryrefslogtreecommitdiff
path: root/yaksh/templates
diff options
context:
space:
mode:
authorPrabhu Ramachandran2017-01-25 09:47:46 +0530
committerGitHub2017-01-25 09:47:46 +0530
commit35b610d92ca8bdd9a2f160f3ef41faadf9600d73 (patch)
tree1d45a300f8a4d2863935a40a1008260582ad4b6d /yaksh/templates
parent6db62cad24e0b7cd9c1a5f354566cc0e9186d1cd (diff)
parent643321cad6922be48bffc1727473f5885ef73670 (diff)
downloadonline_test-35b610d92ca8bdd9a2f160f3ef41faadf9600d73.tar.gz
online_test-35b610d92ca8bdd9a2f160f3ef41faadf9600d73.tar.bz2
online_test-35b610d92ca8bdd9a2f160f3ef41faadf9600d73.zip
Merge pull request #184 from maheshgudi/mcq_bugfix
Minor view changes
Diffstat (limited to 'yaksh/templates')
-rw-r--r--yaksh/templates/yaksh/course_detail.html9
-rw-r--r--yaksh/templates/yaksh/grade_user.html2
-rw-r--r--yaksh/templates/yaksh/monitor.html6
-rw-r--r--yaksh/templates/yaksh/user_data.html23
4 files changed, 22 insertions, 18 deletions
diff --git a/yaksh/templates/yaksh/course_detail.html b/yaksh/templates/yaksh/course_detail.html
index c54f153..57193fe 100644
--- a/yaksh/templates/yaksh/course_detail.html
+++ b/yaksh/templates/yaksh/course_detail.html
@@ -8,6 +8,11 @@
<script language="JavaScript" type="text/javascript" src="{{ URL_ROOT }}/static/yaksh/js/course.js"></script>
{% endblock %}
{% block content %}
+<br/>
+<div class="pull-right">
+ <a class="btn btn-primary" href="{{URL_ROOT}}/exam/manage/toggle_status/{{ course.id }}/">{% if course.active %}Deactivate Course {% else %} Activate Course {% endif %}</a>
+</div>
+<br/>
<div class="row">
<div class="col-md-6">
<center><b><u>Requests</u></b></center><br>
@@ -82,7 +87,5 @@
</form>
</div>
</div>
-<div class="pull-right">
- <a class="btn btn-primary" href="{{URL_ROOT}}/exam/manage/toggle_status/{{ course.id }}/">{% if course.active %}Deactivate Course {% else %} Activate Course {% endif %}</a>
-</div>
+
{% endblock %}
diff --git a/yaksh/templates/yaksh/grade_user.html b/yaksh/templates/yaksh/grade_user.html
index b2ee7bc..1de9420 100644
--- a/yaksh/templates/yaksh/grade_user.html
+++ b/yaksh/templates/yaksh/grade_user.html
@@ -151,7 +151,7 @@ Status : <b style="color: green;"> Passed </b><br/>
{% for ans in answers %}
{% if ans.answer.correct %}
<div class="panel panel-success">
- <div class="panel-heading">Correct:
+ <div class="panel-heading">Correct answer:
{% else %}
<div class="panel panel-danger">
<div class="panel-heading">Error:
diff --git a/yaksh/templates/yaksh/monitor.html b/yaksh/templates/yaksh/monitor.html
index 0ad6401..b84f050 100644
--- a/yaksh/templates/yaksh/monitor.html
+++ b/yaksh/templates/yaksh/monitor.html
@@ -11,10 +11,10 @@
<script type="text/javascript">
$(document).ready(function()
{
- $("#result-table").tablesorter();
- }
-);
+ $("#result-table").tablesorter({sortList: [[5,1]]});
+ });
</script>
+
{% endblock %}
diff --git a/yaksh/templates/yaksh/user_data.html b/yaksh/templates/yaksh/user_data.html
index 9cc2372..e4b3767 100644
--- a/yaksh/templates/yaksh/user_data.html
+++ b/yaksh/templates/yaksh/user_data.html
@@ -84,36 +84,37 @@ User IP address: {{ paper.user_ip }}
</div>
</div>
{% if question.type == "mcq" or question.type == "mcc" %}
- {% if "Correct answer" in answers.0.error %}
+ {% if "Correct answer" in answers.0.error_list %}
<div class="panel panel-success">
{% else %}
<div class="panel panel-danger">
{% endif %}
<div class="panel-heading">
- Autocheck: {{ answers.0.error }}
+ Autocheck: {{ answers.0.error_list.0 }}
</div>
<div class="panel-body">
<h5><u>Student answer:</u></h5>
- <pre><code>{{forloop.counter}}. {{ answers.0 }}</code></pre>
+ <pre><code>{{forloop.counter}}. {{ answers.0.answer }}</code></pre>
</div>
</div>
{% else %}
<h5>Student answer: </h5>
{% for answer in answers %}
{% if not answer.skipped %}
- {% if answer.correct %}
+ {% if answer.answer.correct %}
<div class="panel panel-success">
+ <div class="panel-heading">Correct answer
{% else %}
<div class="panel panel-danger">
- {% endif %}
- <div class="panel-heading">
- {% for error in error %}
- <div class="panel-body">
- <pre><code>{{ error }}</code></pre>
- </div>
+ <div class="panel-heading">Error
+
+ {% for error in answer.error_list %}
+ <div><pre><code>{{ error }}</code></pre></div>
{% endfor %}
+ {% endif %}
+
</div>
- <div class="panel-body"><pre><code>{{ answer.answer.strip }}</code></pre></div>
+ <div class="panel-body"><pre><code>{{ answer.answer.answer.strip }}</code></pre></div>
</div>
{% endif %}
{% endfor %}