From b41cf01f58544a6c71c16bab1854142a3ffc8e03 Mon Sep 17 00:00:00 2001
From: CruiseDevice
Date: Fri, 28 Aug 2020 18:30:42 +0530
Subject: Show max marks for all attempts in answerpaper

- Latest attempt marks were shown in the answerpaper, which made
  it difficult to analyze the paper. This PR fixes the issue
  and the best marks of all the attempt are provided.
---
 yaksh/templates/yaksh/user_data.html | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

(limited to 'yaksh/templates')

diff --git a/yaksh/templates/yaksh/user_data.html b/yaksh/templates/yaksh/user_data.html
index 6252fb3..a79071d 100644
--- a/yaksh/templates/yaksh/user_data.html
+++ b/yaksh/templates/yaksh/user_data.html
@@ -74,19 +74,17 @@
                 </tr>
                 </thead>
                 <tbody>
-                {% for question, answers in paper.get_question_answers.items %}
-                  {% with answers|last as answer %}
-                      <tr>
+                  {% for question, answers in paper.get_question_answers.items %}
+                    <tr>
+                      <td>{{question.summary}}</td>
+                      <td>{{question.type}}</td>
                       <td>
-                        <a href="#question_{{question.id}}">
-                          {{ question.summary }}
-                        </a>
+                        {% for answer in answers %}
+                          {{answer.marks}}
+                        {% endfor %}
                       </td>
-                      <td>{{ question.type }}</td>
-                      <td>{{ answer.answer.marks }}</td>
-                      </tr>
-                  {% endwith %}
-                {% endfor %}
+                    </tr>
+                  {% endfor %}
                 </tbody>
             </table>
             {% for question, answers in paper.get_question_answers.items %}
@@ -313,12 +311,12 @@
                 <div class="col-md-2">
                   <label class="col-form-label" for="q{{ question.id }}">Marks:</label>
                   {% with answers|last as answer %}
-                  <input id="q{{ question.id }}" type="text" name="q{{ question.id }}_marks" size="4" class="form-control" value="{{ answer.answer.marks }}" readonly=""><br><br>
+                    <input id="q{{ question.id }}" type="text" name="q{{ question.id }}_marks" size="4" class="form-control" value="{{ answer.marks }}" readonly=""><br><br>
                   {% endwith %}
                 </div>
               </div>
               <hr/>
-              {% endfor %} {# for question, answers ... #}
+            {% endfor %} {# for question, answers ... #}
               <div class="form-group">
                 <h3>Teacher comments: </h3>
                 <textarea id="comments_{{paper.question_paper.id}}" class="form-control"
-- 
cgit