ross/penracourses
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.xkjq.uk:30001/ross/rad

Browse Source
This commit is contained in:
Ross
2022-04-15 12:47:05 +01:00
parent 091bdfefbc 69d698f97a
commit 7fe16fde92
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
atlas/templates/atlas/collection_scores.html
+1 -1
View File
@@ -63,7 +63,7 @@
{% endfor %} {% endcomment %} {% endfor %} {% endcomment %}
{% for cid in cids %} {% for cid in cids %}
{% with by_question|get_item:question|get_item:cid as ans_score %} {% with by_question|get_item:question|get_item:cid as ans_score %}
<td class="atlas-ans user-answer-score-{{ans_score.1}}" title="answer score: {{ans_score.1}}">{{ans_score.0}}</td> <td class="atlas-ans user-answer-score-{{ans_score.1}}" title="feedback: {{ans_score.2}}">{{ans_score.1}}</td>
{% endwith %} {% endwith %}
{% endfor %} {% endfor %}
</tr> </tr>
atlas/views.py
+3 -2
View File
@@ -1368,6 +1368,7 @@ def collection_case_view(request, pk, case_number):
) )
# TODO: this needs a major cleanup
@user_is_collection_author_or_atlas_editor @user_is_collection_author_or_atlas_editor
def collection_scores_cid(request, pk): def collection_scores_cid(request, pk):
collection = get_object_or_404(CaseCollection, pk=pk) collection = get_object_or_404(CaseCollection, pk=pk)
@@ -1409,7 +1410,7 @@ def collection_scores_cid(request, pk):
s = cid_user_answer s = cid_user_answer
user_names[cid] = cid user_names[cid] = cid
q = cid_user_answer.question q = cid_user_answer.question.case
# if not s: # if not s:
# # skip if no answer # # skip if no answer
@@ -1428,7 +1429,7 @@ def collection_scores_cid(request, pk):
user_answers_marks[cid].append(answer_score) user_answers_marks[cid].append(answer_score)
user_answers_and_marks[cid].append((ans, answer_score)) user_answers_and_marks[cid].append((ans, answer_score))
by_question[q][cid] = (ans, answer_score) by_question[q][cid] = (ans, answer_score, s.feedback)
user_scores = {} user_scores = {}
user_scores_normalised = {} user_scores_normalised = {}