Merge pull request #65 from ankitjavalkar/quiz-score

Add quiz score table in grade user

1 files changed, 21 insertions, 3 deletions

diff --git a/yaksh/templates/yaksh/grade_user.html b/yaksh/templates/yaksh/grade_user.html
index 8c094a7..9537251 100644
--- a/yaksh/templates/yaksh/grade_user.html
+++ b/yaksh/templates/yaksh/grade_user.html
@@ -17,9 +17,9 @@
 Name: {{ data.user.get_full_name.title }}
 {% if data.profile %}
 (roll number: {{ data.profile.roll_number }}) <br/>
-{{ data.profile.position }},
-{{ data.profile.department }},
-{{ data.profile.institute }}
+Position: {{ data.profile.position }} <br/>
+Department: {{ data.profile.department }} <br/>
+Institute: {{ data.profile.institute }} <br/>
 {% endif %}
 </p>
 
@@ -27,6 +27,8 @@ Name: {{ data.user.get_full_name.title }}
 
 {% for paper in data.papers %}
 
+{{ paper.total_marks }}
+
 <h2> Quiz: {{ paper.quiz.description }} </h2>
 
 <p>
@@ -37,11 +39,27 @@ Start time: {{ paper.start_time }} <br/>
 </p>
 
 {% if paper.answers.count %}
+
+<h4> Report </h4><br>
+<table class="zebra-striped">
+    <th>Questions</th>
+    <th>Marks Obtained</th>
+    {% for question, answers in paper.get_question_answers.items %}
+    {% with answers|last as answer %}
+        <tr>
+        <td>{{ question.id }}</td>
+        <td>{{ answer.marks }}</td>
+        </tr>
+    {% endwith %}
+    {% endfor %}
+</table>
+
 <h3> Answers </h3><br>
 <form name=frm id="q{{ paper.quiz.id }}_form"
     action="{{URL_ROOT}}/exam/manage/gradeuser/{{data.user.username}}/" method="post">
 {% csrf_token %}
 {% for question, answers in paper.get_question_answers.items %}
+
 <div class="for-question">
 <p><strong> 
 	Question: {{ question.id }}. {{ question.summary }} (Points: {{ question.points }})