summaryrefslogtreecommitdiff
path: root/yaksh/templates
diff options
context:
space:
mode:
authorankitjavalkar2020-09-14 11:57:54 +0530
committerGitHub2020-09-14 11:57:54 +0530
commit2fbf184c2f18eb52bc4a6c6c6a9168572d2fd23c (patch)
tree711e958f20f7870d08cdb6be29014e5f1d258f56 /yaksh/templates
parent6f5cefcd6614b53285f0747f940c64b97e3783cb (diff)
parenta80fef3789d970d3db17d72f761fe156fe735259 (diff)
downloadonline_test-2fbf184c2f18eb52bc4a6c6c6a9168572d2fd23c.tar.gz
online_test-2fbf184c2f18eb52bc4a6c6c6a9168572d2fd23c.tar.bz2
online_test-2fbf184c2f18eb52bc4a6c6c6a9168572d2fd23c.zip
Merge pull request #751 from CruiseDevice/partial_grade_user
Show max marks for all attempts in answerpaper
Diffstat (limited to 'yaksh/templates')
-rw-r--r--yaksh/templates/yaksh/user_data.html24
1 files changed, 11 insertions, 13 deletions
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"