.
This commit is contained in:
@@ -78,7 +78,7 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
</p>
|
</p>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if previous > -1 %}
|
{% if previous %}
|
||||||
<button type="submit" name="previous" class="save btn btn-default">Previous</button>
|
<button type="submit" name="previous" class="save btn btn-default">Previous</button>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if next %}
|
{% if next %}
|
||||||
|
|||||||
+4
-1
@@ -1256,12 +1256,14 @@ def collection_case_view_take(request, pk, case_number, cid, passcode):
|
|||||||
cases = collection.cases.all().order_by("casedetail__sort_order").prefetch_related()
|
cases = collection.cases.all().order_by("casedetail__sort_order").prefetch_related()
|
||||||
case = cases[case_number]
|
case = cases[case_number]
|
||||||
|
|
||||||
|
if collection.collection_type == "REP":
|
||||||
c = CidUser.objects.filter(cid=cid).first()
|
c = CidUser.objects.filter(cid=cid).first()
|
||||||
cid_user_exam = collection.get_or_create_cid_user_exam(cid_user=c)
|
cid_user_exam = collection.get_or_create_cid_user_exam(cid_user=c)
|
||||||
case_detail = CaseDetail.objects.get(case=case, collection=collection)
|
case_detail = CaseDetail.objects.get(case=case, collection=collection)
|
||||||
answer = case_detail.cidreportanswer_set.filter(cid=cid).first()
|
answer = case_detail.cidreportanswer_set.filter(cid=cid).first()
|
||||||
|
|
||||||
if request.method == "POST":
|
if request.method == "POST":
|
||||||
|
if collection.collection_type == "REP":
|
||||||
if not collection.publish_results:
|
if not collection.publish_results:
|
||||||
if answer:
|
if answer:
|
||||||
form = CidReportAnswerForm(request.POST, instance=answer)
|
form = CidReportAnswerForm(request.POST, instance=answer)
|
||||||
@@ -1280,7 +1282,7 @@ def collection_case_view_take(request, pk, case_number, cid, passcode):
|
|||||||
kwargs = {"pk": pk, "cid": cid, "passcode": passcode}
|
kwargs = {"pk": pk, "cid": cid, "passcode": passcode}
|
||||||
redirect_url = "atlas:collection_case_view_take"
|
redirect_url = "atlas:collection_case_view_take"
|
||||||
|
|
||||||
if cid is None:
|
else:
|
||||||
kwargs = {"pk": pk}
|
kwargs = {"pk": pk}
|
||||||
redirect_url = "atlas:collection_case_view_review"
|
redirect_url = "atlas:collection_case_view_review"
|
||||||
|
|
||||||
@@ -1305,6 +1307,7 @@ def collection_case_view_take(request, pk, case_number, cid, passcode):
|
|||||||
|
|
||||||
series_list = case.series.all().prefetch_related("images", "examination", "plane")
|
series_list = case.series.all().prefetch_related("images", "examination", "plane")
|
||||||
|
|
||||||
|
print("case_no")
|
||||||
previous = case_number > 0
|
previous = case_number > 0
|
||||||
next = case_number < (len(cases) - 1)
|
next = case_number < (len(cases) - 1)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user