.

2022-04-02 23:30:33 +01:00
parent 36eefe9784
commit 28c6d5ae5e
2 changed files with 41 additions and 3 deletions
@@ -1072,12 +1072,36 @@ def collection_take(request, pk):

    return render(request, "atlas/collection_take.html", {"collection": collection})

-
@user_is_collection_author_or_atlas_editor
-def collection_mark_cid(request, pk):
+def collection_mark_overview(request, pk):
    collection = get_object_or_404(CaseCollection, pk=pk)

-    return render(request, "atlas/collection_take.html", {"collection": collection})
+    if collection.collection_type == "REV":
+        raise Http404("Collection in review mode")
+
+    cases = collection.cases.all().order_by("casedetail__sort_order").prefetch_related()
+
+    case_details = CaseDetail.objects.filter(case__in=cases, collection=collection).prefetch_related("case")
+
+    answers = CidReportAnswer.objects.filter(question=case_details)
+
+    return render(request, "atlas/collection_mark_overview.html", {"collection": collection, "answers": answers, "case_details": case_details})
+
+@user_is_collection_author_or_atlas_editor
+def collection_mark_question(request, pk, case_number):
+    collection = get_object_or_404(CaseCollection, pk=pk)
+
+    if collection.collection_type == "REV":
+        raise Http404("Collection in review mode")
+
+    cases = collection.cases.all().order_by("casedetail__sort_order").prefetch_related()
+    case = cases[case_number]
+
+    case_detail = CaseDetail.objects.filter(case=case, collection=collection)
+
+    answers = CidReportAnswer.objects.filter(question=case_detail)
+
+    return render(request, "atlas/collection_mark_question.html", {"collection": collection})


@user_is_collection_author_or_atlas_editor