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)) # s = s.translate(str.maketrans('', '', string.punctuation))
# return s # return s
def get_blank_answer(self):
return 0
def get_blank_answer_string(self):
return ""
def get_answer_score(self, cached=True): def get_answer_score(self, cached=True):
if cached and self.score: if cached and self.score:
if self.score == Answer.MarkOptions.CORRECT: if self.score == Answer.MarkOptions.CORRECT:
+1 -1
View File
@@ -32,7 +32,7 @@
</tr> </tr>
{% for user, value in user_answers_marks.items %} {% for user, value in user_answers_marks.items %}
<tr> <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}}</td>
<td>{{user_scores|get_item:user}}</td> <td>{{user_scores|get_item:user}}</td>
</tr> </tr>
+1 -1
View File
@@ -33,7 +33,7 @@
</tr> </tr>
{% for user, value in user_answers_marks.items %} {% for user, value in user_answers_marks.items %}
<tr> <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|get_item:user}}</td>
<td>{{user_scores_normalised|get_item:user}}</td> <td>{{user_scores_normalised|get_item:user}}</td>
</tr> </tr>
+1 -1
View File
@@ -23,7 +23,7 @@
</tr> </tr>
{% for user, value in user_answers_marks.items %} {% for user, value in user_answers_marks.items %}
<tr> <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|get_item:user}}</td>
</tr> </tr>
{% endfor %} {% endfor %}