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

atlas/templates/atlas/collection_scores.html

@@ -63,7 +63,7 @@
                     {% endfor %} {% endcomment %}
                     {% for cid in cids %}
                         {% 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 %}
                     {% endfor %}
                 </tr>

atlas/views.py

@@ -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
 def collection_scores_cid(request, pk):
     collection = get_object_or_404(CaseCollection, pk=pk)
@@ -1409,7 +1410,7 @@ def collection_scores_cid(request, pk):
         s = cid_user_answer
         user_names[cid] = cid
 
-        q = cid_user_answer.question
+        q = cid_user_answer.question.case
 
         # if not s:
         #    # skip if no answer
@@ -1428,7 +1429,7 @@ def collection_scores_cid(request, pk):
         user_answers_marks[cid].append(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_normalised = {}