This commit is contained in:
Ross
2021-12-18 17:52:36 +00:00
parent 2a3b8b06df
commit 044c7dd512
4 changed files with 9 additions and 15 deletions
-6
View File
@@ -468,12 +468,6 @@ class CidUserAnswer(models.Model):
# s = s.translate(str.maketrans('', '', string.punctuation))
# return s
def get_blank_answer(self):
return 0
def get_blank_answer_string(self):
return ""
def get_answer_score(self, cached=True):
if cached and self.score:
if self.score == Answer.MarkOptions.CORRECT:
+1 -1
View File
@@ -32,7 +32,7 @@
</tr>
{% for user, value in user_answers_marks.items %}
<tr>
{% comment %} <td><a href="{% url 'cid_scores' user %}">{{user}}</a></td> {% endcomment %}
<td><a href="{% url 'cid_scores_admin' user %}">{{user}}</a></td>
<td>{{user}}</td>
<td>{{user_scores|get_item:user}}</td>
</tr>
+1 -1
View File
@@ -33,7 +33,7 @@
</tr>
{% for user, value in user_answers_marks.items %}
<tr>
<td><a href="{% url 'cid_scores' user %}">{{user}}</a></td>
<td><a href="{% url 'cid_scores_admin' user %}">{{user}}</a></td>
<td>{{user_scores|get_item:user}}</td>
<td>{{user_scores_normalised|get_item:user}}</td>
</tr>
+7 -7
View File
@@ -23,7 +23,7 @@
</tr>
{% for user, value in user_answers_marks.items %}
<tr>
<td><a href="{% url 'cid_scores' user %}">{{user}}</a></td>
<td><a href="{% url 'cid_scores_admin' user %}">{{user}}</a></td>
<td>{{user_scores|get_item:user}}</td>
</tr>
{% endfor %}
@@ -33,13 +33,13 @@
<h3>Results as a table</h3>
<table class="table table-dark table-striped table-hover table-sm">
<thead class="thead-dark">
<tr>
<th>Candidate</th>
{% for cid in cids %}
<th>{{cid}}</th>
{% endfor %}
<tr>
<th>Candidate</th>
{% for cid in cids %}
<th>{{cid}}</th>
{% endfor %}
</tr>
</tr>
</thead>
{% for question in questions %}
<tr>