From 6809186e406f96fa321b55060364bcaf7bfc4a99 Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Thu, 2 Feb 2012 12:39:30 +0530 Subject: Updated user_data and grade_user forms (new UI) --- testapp/templates/exam/grade_user.html | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) (limited to 'testapp/templates/exam/grade_user.html') diff --git a/testapp/templates/exam/grade_user.html b/testapp/templates/exam/grade_user.html index 75ed2e0..2237475 100644 --- a/testapp/templates/exam/grade_user.html +++ b/testapp/templates/exam/grade_user.html @@ -3,8 +3,17 @@ {% block title %} Grading papers for {{ data.user.get_full_name.title }} {% endblock title %} {% block content %} + + +
+
+
+

Online Test

+
+
+
+

Grading papers for {{ data.user.get_full_name.title }}


-

Grading papers for {{ data.user.get_full_name.title }}

Name: {{ data.user.get_full_name.title }} @@ -30,7 +39,7 @@ Start time: {{ paper.start_time }}

{% if paper.answers.count %} -

Answers

+

Answers


{% csrf_token %} @@ -54,14 +63,15 @@ Start time: {{ paper.start_time }}
{% with answers|last as answer %} Marks: + value="{{ answer.marks }}">

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

Teacher comments:

-
- +
+
+
{% endif %} {# if paper.answers.count #} @@ -80,4 +90,15 @@ Marks: Admin +
+
+
+ + +
+ + + {% endblock content %} -- cgit From 493f228229d96dab4a13b21cf7d4d089fcf7b2fd Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Mon, 6 Feb 2012 15:20:41 +0530 Subject: removed & tags from the forms --- testapp/templates/exam/grade_user.html | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'testapp/templates/exam/grade_user.html') diff --git a/testapp/templates/exam/grade_user.html b/testapp/templates/exam/grade_user.html index 2237475..89faf46 100644 --- a/testapp/templates/exam/grade_user.html +++ b/testapp/templates/exam/grade_user.html @@ -3,8 +3,7 @@ {% block title %} Grading papers for {{ data.user.get_full_name.title }} {% endblock title %} {% block content %} - - +
@@ -99,6 +98,4 @@ Marks: - - {% endblock content %} -- cgit From 7c65d02d8a1f2ea72eabf3f13f85b8b444b1505e Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Wed, 15 Feb 2012 18:35:40 +0530 Subject: New views to manage/moderate Quiz --- testapp/templates/exam/grade_user.html | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) (limited to 'testapp/templates/exam/grade_user.html') diff --git a/testapp/templates/exam/grade_user.html b/testapp/templates/exam/grade_user.html index 89faf46..fa0e516 100644 --- a/testapp/templates/exam/grade_user.html +++ b/testapp/templates/exam/grade_user.html @@ -1,18 +1,10 @@ -{% extends "base.html" %} +{% extends "manage.html" %} {% block title %} Grading papers for {{ data.user.get_full_name.title }} {% endblock title %} -{% block content %} - -
-
-
-

Online Test

-
-
-
-

Grading papers for {{ data.user.get_full_name.title }}


+{% block subtitle %}Grading papers for {{ data.user.get_full_name.title }}{% endblock %} +{% block manage %}

Name: {{ data.user.get_full_name.title }} @@ -89,13 +81,5 @@ Marks: Admin -

-
-
-
-

© FOSSEE group, IIT Bombay

-
- -
-{% endblock content %} +{% endblock%} -- cgit From f6a90c1eb603c9f3b8178102e387025880c0a5ac Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Mon, 20 Feb 2012 19:51:58 +0530 Subject: changes to manage questions --- testapp/templates/exam/grade_user.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'testapp/templates/exam/grade_user.html') diff --git a/testapp/templates/exam/grade_user.html b/testapp/templates/exam/grade_user.html index fa0e516..bad1765 100644 --- a/testapp/templates/exam/grade_user.html +++ b/testapp/templates/exam/grade_user.html @@ -32,7 +32,7 @@ Start time: {{ paper.start_time }}
{% if paper.answers.count %}

Answers


+ action="{{URL_ROOT}}/exam/manage/grade_user/{{data.user.username}}/" method="post"> {% csrf_token %} {% for question, answers in paper.get_question_answers.items %}

@@ -71,11 +71,11 @@ Marks: 1 %} - + Monitor quiz {% else %} {% with data.papers.0 as paper %} - + Monitor quiz {% endwith %} {% endif %} -- cgit From b1fbf5b02280de5b78b0249e777a179e34b50b98 Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Fri, 24 Feb 2012 16:16:38 +0530 Subject: formating and identation --- testapp/templates/exam/grade_user.html | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'testapp/templates/exam/grade_user.html') diff --git a/testapp/templates/exam/grade_user.html b/testapp/templates/exam/grade_user.html index bad1765..5b0e1a7 100644 --- a/testapp/templates/exam/grade_user.html +++ b/testapp/templates/exam/grade_user.html @@ -71,8 +71,7 @@ Marks: 1 %} - - Monitor quiz +Monitor quiz {% else %} {% with data.papers.0 as paper %} @@ -81,5 +80,4 @@ Marks: Admin - {% endblock%} -- cgit From b7ad768a6cc4fe5c8a05e20b1968f13a678c22cc Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Tue, 28 Feb 2012 12:09:28 +0530 Subject: changes to remove the inline css from every page --- testapp/templates/exam/grade_user.html | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'testapp/templates/exam/grade_user.html') diff --git a/testapp/templates/exam/grade_user.html b/testapp/templates/exam/grade_user.html index 5b0e1a7..fccdaaa 100644 --- a/testapp/templates/exam/grade_user.html +++ b/testapp/templates/exam/grade_user.html @@ -3,6 +3,10 @@ {% block title %} Grading papers for {{ data.user.get_full_name.title }} {% endblock title %} {% block subtitle %}Grading papers for {{ data.user.get_full_name.title }}{% endblock %} + +{% block css %} + +{% endblock %} {% block manage %} @@ -32,12 +36,13 @@ Start time: {{ paper.start_time }}
{% if paper.answers.count %}

Answers


+ action="{{URL_ROOT}}/exam/manage/gradeuser/{{data.user.username}}/" method="post"> {% csrf_token %} {% for question, answers in paper.get_question_answers.items %}

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

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

Choices: -- cgit From 7660073c5c83534a869f685b27c0fe0152b9983c Mon Sep 17 00:00:00 2001 From: jayparikh111 Date: Tue, 28 Feb 2012 18:14:17 +0530 Subject: Minor changes for displaying question details in grade_user and licensing in css --- testapp/templates/exam/grade_user.html | 37 ++++++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-) (limited to 'testapp/templates/exam/grade_user.html') diff --git a/testapp/templates/exam/grade_user.html b/testapp/templates/exam/grade_user.html index fccdaaa..5d3aa58 100644 --- a/testapp/templates/exam/grade_user.html +++ b/testapp/templates/exam/grade_user.html @@ -8,6 +8,22 @@ {% endblock %} +{% block script %} + +{% endblock %} {% block manage %}

@@ -35,14 +51,25 @@ Start time: {{ paper.start_time }}
{% if paper.answers.count %}

Answers


- {% csrf_token %} {% for question, answers in paper.get_question_answers.items %}

- - Question: {{ question.id }}. {{ question.summary }} + Question: {{ question.id }}. {{ question.summary }} +

+
+ +
+ + (Points: {{ question.points }})

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

Choices: @@ -62,6 +89,8 @@ Marks:

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

Teacher comments:

-- cgit From 87862b8c8d7822a4578b5cb5f413bedb37454bd2 Mon Sep 17 00:00:00 2001 From: jayparikh111 Date: Wed, 29 Feb 2012 13:14:00 +0530 Subject: minor changes for rendering question(s) --- testapp/templates/exam/grade_user.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'testapp/templates/exam/grade_user.html') diff --git a/testapp/templates/exam/grade_user.html b/testapp/templates/exam/grade_user.html index 5d3aa58..b7970e8 100644 --- a/testapp/templates/exam/grade_user.html +++ b/testapp/templates/exam/grade_user.html @@ -56,7 +56,7 @@ Start time: {{ paper.start_time }}
{% csrf_token %} {% for question, answers in paper.get_question_answers.items %}

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

- (Points: {{ question.points }})

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

Choices: {% for option in question.options.strip.splitlines %} {{option}}, {% endfor %} -- cgit From a7c84a478789e9e835dcbb3ea41b1d519ba69b4d Mon Sep 17 00:00:00 2001 From: jayparikh111 Date: Tue, 13 Mar 2012 18:44:01 +0530 Subject: minor changes for UI --- testapp/templates/exam/grade_user.html | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) (limited to 'testapp/templates/exam/grade_user.html') diff --git a/testapp/templates/exam/grade_user.html b/testapp/templates/exam/grade_user.html index b7970e8..c6f6343 100644 --- a/testapp/templates/exam/grade_user.html +++ b/testapp/templates/exam/grade_user.html @@ -10,17 +10,20 @@ {% block script %} {% endblock %} @@ -56,9 +59,9 @@ Start time: {{ paper.start_time }}
{% csrf_token %} {% for question, answers in paper.get_question_answers.items %}

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

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

+