fix a number of things

atlas/templates/atlas/collection_case_view_take.html

@@ -1,6 +1,7 @@
 {% extends 'atlas/base.html' %}
 
 {% block content %}
+    <span class="collection-name-blend">Collection: {{collection}}</span>
     <h2>Case {{case_number|add:1}}
 
         {% if show_title %}
@@ -75,6 +76,10 @@
         </p>
     {% endif %}
 
+    {% if collection.publish_results or cid_user_exam.completed %}
+        <a href="{% url 'atlas:add_self_review' cid_user_exam.id case.id %}"><button>Add self review</button></a>
+
+    {% endif %}
     <form method="POST" class="post-form">{% csrf_token %}
         {% if collection.collection_type == "REP" %}
             <div class="form-contents">
@@ -84,21 +89,22 @@
             </div>
             <p>
                 {% if completed %}
-                    <h4>Answer score: {{answer.score}}</h4>
-                    Answer feedback: {{answer.feedback|safe}}
-                    <br/>
 
-                    {% if self_review %}
-                        <h4>Self Feedback</h4>
+                    {% if collection.self_review %}
+                        {% if self_review %}
+                            <h4>Self Feedback</h4>
 
-                        {% for review in self_review %}
-                            {{review.get_display_block}}
+                            {% for review in self_review %}
+                                {{review.get_display_block}}
 
-                        {% endfor %}
+                            {% endfor %}
+                        {% endif %}
+                    {% else %}
+                        <h4>Answer score: {{answer.score}}</h4>
+                        Answer feedback: {{answer.feedback|safe}}
+                        <br/>
                     {% endif %}
 
-
-
                 {% endif %}
             </p>
 
@@ -117,10 +123,6 @@
         <br />
         <button type="submit" name="finish" class="save btn btn-default">Overview</button>
         <button type="submit" id="goto-button" value="test" name="goto" class="hide">goto</button>
-        {% if collection.publish_results or cid_user_exam.completed %}
-            <a href="{% url 'atlas:add_self_review' cid_user_exam.id case.id %}">Add self review</a>
-
-        {% endif %}
     </form>
     <style>
         label {

atlas/templates/atlas/collection_take_overview.html

@@ -15,8 +15,8 @@
     {{answer_count}} out of {{collection_length}} cases answered. Click to go to case.
     <div class="sba-finish-list">
         <ul>
-            {% for question, answer in question_answer_tuples %}
-                <li> <span {% if not collection.review_only and not answer %}class="unanswered"{% endif %}>
+            {% for question, answer, self_review in question_answer_tuples %}
+                <li> <span class="{% if not collection.review_only and not answer %}unanswered{% endif %}">
                     <a href="
                              {% if cid is not None %}
                                  {% url 'atlas:collection_case_view_take' pk=collection.id case_number=forloop.counter0 cid=cid passcode=passcode %}
@@ -24,7 +24,7 @@
                                  {% url 'atlas:collection_case_view_take_user' pk=collection.id case_number=forloop.counter0 %}
                              {% endif %}
                             ">
-                        Case: {{forloop.counter}}
+                        Case: {{forloop.counter}}{% if self_review %} <span class="self-review-complete" title="You have reviewed this case."> <i class="bi-card-checklist"></i></span>{% endif %}
                     </a>
                     <br/>
                     {% if not collection.review_only  %}

atlas/templates/atlas/collection_take_start.html

@@ -22,6 +22,9 @@
                 <button>Start</button>
             {% endif %}
         </a>
+            {% if cid_exam.completed %}
+                <a href="{% url 'atlas:collection_take_overview_user' pk=collection.pk %}"><button>Overview</button></a>
+            {% endif %}
     {% else %}
         Enter your CID and passcode in the below boxes.<br />
         <p><input id="cid-box" type="text" value="Candidate ID"></p>

atlas/templates/atlas/index.html

@@ -1,4 +1,8 @@
 {% extends 'atlas/base.html' %}
 
 {% block content %}
+<h2>Atlas</h2>
+
+<a href="{% url 'atlas:user_collections' %}">Available collections</a>
+
 {% endblock %}

atlas/templates/atlas/selfreview_form.html

@@ -33,4 +33,5 @@
         </div> {% endcomment %}
         <input type="submit" value="Submit">
     </form>
+    {% if review %}<br/><a href="{% url 'atlas:self_review_delete' user_exam.id case.id review.id %}"><button>Delete review</button></a>{% endif %}
 {% endblock %}

atlas/templates/atlas/user_collections.html

@@ -0,0 +1,16 @@
+{% extends 'atlas/base.html' %}
+
+{% block content %}
+<h2>Collections</h2>
+
+    
+    <ul>
+    {% for collection in collections %}
+    <li>
+        <a href="{% url 'atlas:collection_take_start' collection.pk %}">{{collection}} {{collelction.is_complete}}</a>
+    </li>
+        
+    {% endfor %}
+    </ul>
+        
+{% endblock %}