From 684156fafe9ad06f5b5421d53f667b5ff03edd58 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 14 Feb 2024 22:05:08 +0000
Subject: [PATCH] .

---
 atlas/templates/atlas/collection_viva.html | 2 ++
 atlas/views.py                             | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/atlas/templates/atlas/collection_viva.html b/atlas/templates/atlas/collection_viva.html
index afdb3912..eda249d8 100644
--- a/atlas/templates/atlas/collection_viva.html
+++ b/atlas/templates/atlas/collection_viva.html
@@ -13,7 +13,9 @@
                 <h3>Cases</h3>
                 <ol id="" class="sortable">
                     {% for case in cases %}
+
                         <li data-question_pk={{case.pk}}>
+                            {{case.casedetail.sort_order}}
                             <div class="case-item" data-title="{{case.title}}" data-case={{case.pk}} data-case-json='{{case.get_viva_details_json}}'>Case {{forloop.counter}}: {{case.title}} &nbsp;
                                 {% comment %} <button class="show-case no-padding"  data-target="/ohif/viewer/dicomjson?url=https://www.penracourses.org.uk{% url 'atlas:case_dicom_json' case.pk %}">Show</button> {% endcomment %}
 {% comment %}                 <button class="send-message no-padding" data-title="{{case.title}}" data-target="/ohif/viewer/dicomjson?url=https://www.penracourses.org.uk{% url 'atlas:case_dicom_json' case.pk %}">Open</button> {% endcomment %}
diff --git a/atlas/views.py b/atlas/views.py
index c7b019c8..f84b52f8 100755
--- a/atlas/views.py
+++ b/atlas/views.py
@@ -1354,13 +1354,13 @@ def collection_viva(request, pk):
 def collection_viva_case(request, pk, case_number):
     collection = get_object_or_404(CaseCollection, pk=pk)
 
-    cases = collection.cases.all().order_by("casedetail__sort_order")
-    current_case = cases[case_number]
+    #cases = collection.cases.all().order_by("casedetail__sort_order")
+    current_case = collection.get_case_by_index(case_number)
 
     return render(
         request,
         "atlas/collection_viva_case.html",
-        {"collection": collection, "cases": cases, "current_case": current_case},
+        {"collection": collection, "current_case": current_case},
     )
 
 @user_is_collection_author_or_atlas_editor