From 6b5422436697b01b4dbcd730d95f46424fedb344 Mon Sep 17 00:00:00 2001 From: maheshgudi Date: Thu, 15 Sep 2016 15:12:19 +0530 Subject: beautified grade user and monitor --- yaksh/static/yaksh/css/gradeuser.css | 58 ----------------- yaksh/static/yaksh/css/view_answerpaper.css | 15 +++++ yaksh/templates/yaksh/grade_user.html | 96 +++++++++++++++++------------ yaksh/templates/yaksh/user_data.html | 87 +++++++++++++++++++------- 4 files changed, 137 insertions(+), 119 deletions(-) delete mode 100644 yaksh/static/yaksh/css/gradeuser.css diff --git a/yaksh/static/yaksh/css/gradeuser.css b/yaksh/static/yaksh/css/gradeuser.css deleted file mode 100644 index af5de3f..0000000 --- a/yaksh/static/yaksh/css/gradeuser.css +++ /dev/null @@ -1,58 +0,0 @@ -textarea -{ -width : 550px; -height : 200px; - -} - -.for-question{ - background: none repeat scroll 0 0 #F1F1F1; - border-radius: 6px 6px 6px 6px; - margin-bottom: 10px; - padding: 5px; -} - -#headerDiv, #contentDiv { -float: left; -} -#titleText { -float: left; -font-size: 1.1em; -font-weight: bold; -margin: 5px; -} -#myHeader { -font-size: 1.1em; -font-weight: bold; -margin: 5px; -} -#headerDiv { -background-color: #0037DB; -color: #9EB6FF; -} - -#contentDiv { - background-color:#F0F8FF; - border: 1px solid #C9C9C9; - border-radius: 5px 5px 5px 5px; - margin-bottom: 10px; - min-width: 685px; - -} - -#myContent { -margin: 5px 10px; - -} -#headerDiv a { -float: right; -margin: 10px 10px 5px 5px; -} -#headerDiv a:hover { -color: #FFFFFF; -} - -#attempt { - width: 157px; - position: relative; left:20%; -} diff --git a/yaksh/static/yaksh/css/view_answerpaper.css b/yaksh/static/yaksh/css/view_answerpaper.css index 50eab55..fdcb1c6 100644 --- a/yaksh/static/yaksh/css/view_answerpaper.css +++ b/yaksh/static/yaksh/css/view_answerpaper.css @@ -58,4 +58,19 @@ code{ } pre{ background-color: transparent; +} + +/*for grade user*/ +textarea +{ +width : 100%; +height : 15%; +} +#attempt { + width: 157px; + position: relative; left:20%; +} +#myContent { +margin: 5px 10px; + } \ No newline at end of file diff --git a/yaksh/templates/yaksh/grade_user.html b/yaksh/templates/yaksh/grade_user.html index 2c5403c..7b79373 100644 --- a/yaksh/templates/yaksh/grade_user.html +++ b/yaksh/templates/yaksh/grade_user.html @@ -5,11 +5,7 @@ {% block subtitle %} Grade User {% endblock %} {% block css %} - -{% endblock %} - -{% block script %} - + {% endblock %} {% block manage %} @@ -88,6 +84,7 @@ Attempt Number: {{paper.attempt_number}} Total attempts at questions: {{ paper.answers.count }}
Marks obtained: {{ paper.marks_obtained }}
Start time: {{ paper.start_time }}
+End time: {{ paper.end_time }}
{%if paper.percent%} Percentage obtained: {{paper.percent}}%
{% endif %} @@ -125,42 +122,63 @@ Status : Passed
method="post"> {% csrf_token %} {% for question, answers in paper.get_question_answers.items %} - -
-

- Question: {{ question.id }}. {{ question.summary }} (Points: {{ question.points }}) - -Details

-
- -
-
- -{% if question.type == "mcq" %} -
-

Choices: -{% for option in question.options.strip.splitlines %} {{option}}, {% endfor %} -

-

Student answer: {{ answers.0 }}

-{% else %}{# non-mcq questions #} -
-{% for answer in answers %}################################################################################
-{{ answer.answer.strip }}
-# Autocheck: {{ answer.error }}
-{% endfor %}
-{% endif %} {# if question.type #} -{% with answers|last as answer %} -Marks: +
+ Details: {{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 }} + {% endfor %} + {% else %} +
Test cases:
+ {% for testcase in question.get_test_cases %} +
{{ forloop.counter }}. {{ testcase.test_case }} + {% endfor %} + {%endif%} +
+
+ {% if question.type == "mcq" or question.type == "mcc" %} + {% if "Correct answer" in answers.0.error %} +
+ {% else %} +
+ {% endif %} +
+ Autocheck: {{ answers.0.error }} +
+
+
Student answer:
+ 
{{forloop.counter}}. {{ answers.0 }}
+
+
+ {% else %} +
Student answer:
+ {% for answer in answers %} + {% if not answer.skipped %} + {% if "Correct answer" in answer.error %} +
+ {% else %} +
+ {% endif %} +
Autocheck: {{ answer.error }}
+ 
{{ answer.answer.strip }}
+
+ {% endif %} + {% endfor %} + {% endif %} + {% with answers|last as answer %} + Marks:

-{% endwith %} -
-
-{% endfor %} {# for question, answers ... #} - + {% endwith %} +
+ {% endfor %} {# for question, answers ... #}

Teacher comments: