This commit is contained in:
Ross
2022-04-04 13:31:07 +01:00
parent 5f71c09ad3
commit 64d81d1e50
3 changed files with 48 additions and 5 deletions
@@ -14,8 +14,13 @@
<ul>
{% for case_detail, answers in case_map.items %}
<li>
{{case_detail.case.title}}<br/>
{% for answer in answers %}{{answer.answer}}: {{answer.score}}<br />{% endfor %}
Case: {{case_detail.case.title}}<br/>
Answers
<ul>
{% for answer in answers %}
<li><a href="{% url 'atlas:collection_mark_question' collection.pk forloop.counter0 %}">{{answer.answer}}: {{answer.score}}</a></li>
{% endfor %}
</ul>
</li>
{% endfor %}
@@ -0,0 +1,16 @@
{% extends 'atlas/base.html' %}
{% block content %}
{% include 'atlas/collection_headers.html' %}
<h3>Marking case: {{case_detail.case.title}}</h3>
<ul>
{% for answer in answers %}
<li>
{{answer.answer}}: {{answer.score}}
</li>
{% endfor %}
</ul>
{% endblock %}
+25 -3
View File
@@ -1072,6 +1072,7 @@ def collection_take(request, pk):
return render(request, "atlas/collection_take.html", {"collection": collection})
@user_is_collection_author_or_atlas_editor
def collection_mark_overview(request, pk):
collection = get_object_or_404(CaseCollection, pk=pk)
@@ -1081,7 +1082,9 @@ def collection_mark_overview(request, pk):
cases = collection.cases.all().order_by("casedetail__sort_order").prefetch_related()
case_details = CaseDetail.objects.filter(case__in=cases, collection=collection).prefetch_related("case")
case_details = CaseDetail.objects.filter(
case__in=cases, collection=collection
).prefetch_related("case")
answers = CidReportAnswer.objects.filter(question__in=case_details)
@@ -1092,7 +1095,17 @@ def collection_mark_overview(request, pk):
for answer in answers:
case_map[answer.question].append(answer)
return render(request, "atlas/collection_mark_overview.html", {"collection": collection, "answers": answers, "case_details": case_details, "case_map": case_map})
return render(
request,
"atlas/collection_mark_overview.html",
{
"collection": collection,
"answers": answers,
"case_details": case_details,
"case_map": case_map,
},
)
@user_is_collection_author_or_atlas_editor
def collection_mark_question(request, pk, case_number):
@@ -1108,7 +1121,16 @@ def collection_mark_question(request, pk, case_number):
answers = CidReportAnswer.objects.filter(question=case_detail)
return render(request, "atlas/collection_mark_question.html", {"collection": collection})
return render(
request,
"atlas/collection_mark_question.html",
{
"collection": collection,
"answers": answers,
"case_detail": case_detail,
"case_number": case_number,
},
)
@user_is_collection_author_or_atlas_editor