fix a few missing things

anatomy/urls.py

@@ -53,6 +53,7 @@ urlpatterns = [
         "exam/<int:exam_pk>/<int:sk>/mark/review", views.mark_review, name="mark_review"
     ),
     path("exam/<int:pk>/markers", views.ExamMarkersUpdate.as_view(), name="exam_markers"),
+    path("exam/<int:pk>/groups", views.ExamGroupsUpdate.as_view(), name="exam_groups_edit"),
     path("exam/<int:pk>/authors", views.ExamAuthorUpdate.as_view(), name="exam_authors"),
     path("exam/create", views.ExamCreate.as_view(), name="exam_create"),
     path("exam/<int:exam_id>/clone", views.ExamClone.as_view(), name="exam_clone"),

atlas/forms.py

@@ -57,7 +57,7 @@ from autocomplete import widgets as htmx_widgets
 
 import logging
 
-from generic.forms import ExamAuthorFormMixin
+from generic.forms import ExamAuthorFormMixin, ExamGroupsFormMixin
 
 from crispy_forms.helper import FormHelper
 
@@ -749,6 +749,9 @@ class SeriesAuthorForm(ExamAuthorFormMixin):
     class Meta(ExamAuthorFormMixin.Meta):
         model = Series
 
+class ExamGroupsForm(ExamGroupsFormMixin):
+    class Meta(ExamGroupsFormMixin.Meta):
+        model = CaseCollection
 
 class AnswerJSONForm(Form):
 

atlas/models.py

@@ -1188,6 +1188,14 @@ class SelfReview(models.Model):
     review_date = models.DateTimeField(auto_now_add=True)
     review_update_date = models.DateTimeField(auto_now=True)
 
+    def __str__(self) -> str:
+        date = self.review_date
+
+        if self.review_update_date is not None:
+            date = self.review_update_date
+
+        return f"Self review: {date:%Y-%m-%d} / {self.user_exam.exam} - {self.case}"
+
     def get_absolute_url(self):
         return self.user_exam.exam.get_case_take_url(self.case)
 

atlas/templates/atlas/collection_case_view_take.html

@@ -67,20 +67,20 @@
                     Images
                 </summary>
                 {% for series, prior, relation in series_to_load %}
-                    <span class="series-block 
+                    <span class="series-block
-                    {% if prior %}
+                                 {% if prior %}
-                       prior 
+                                     prior
-                    {% endif %}
+                                 {% endif %}
-                        ">
+                                ">
                         <a href="#" onclick='window.loadDicomViewer(window.images[{{forloop.counter0}}])'>
                             <span>
                                 <span class="series-block-series-number">Series {{ forloop.counter }}:</span>
                                 {{series.get_block}}
                             </span>
                             {% if prior %}
-                            <br/><span class="relation">Prior: {{relation}}</span>
+                                <br/><span class="relation">Prior: {{relation}}</span>
                             {% endif %}
-                                
+
                         </a>
                     </span>
                 {% endfor %}
@@ -168,10 +168,10 @@
                 </div>
 
 
-                <div>
+                {% if collection.self_review %}
-                    {% if collection.self_review %}
+                    <div>
                         <p>
-                            <a href="{% url 'atlas:add_self_review' cid_user_exam.id case.id %}"><button>Add self review</button></a>
+                            <a href="{% url 'atlas:add_self_review' cid_user_exam.id case.id %}"><button type="button">Add self review</button></a>
                         </p>
                         {% if self_review %}
                             <h4>Self Feedback</h4>
@@ -181,12 +181,12 @@
 
                             {% endfor %}
                         {% endif %}
-                    {% else %}
+                    </div>
-                        <h4>Answer score: {{answer.score}}</h4>
+                {% else %}
-                        Answer feedback: {{answer.feedback|safe}}
+                    <h4>Answer score: {{answer.score}}</h4>
-                        <br/>
+                    Answer feedback: {{answer.feedback|safe}}
-                    {% endif %}
+                    <br/>
-                </div>
+                {% endif %}
 
                 <details><summary class="opacity-50">View questions</summary>
                     {{form.json.errors}}
@@ -340,7 +340,7 @@
             {% for series, prior, relation in series_to_load %}
                 {{ forloop.counter0 }}: ["{{ series.get_image_url_array_not_json }}"],
             {% endfor %}
-                
+
         }
 
         $(document).ready(function () {

atlas/templates/atlas/view.html

@@ -7,7 +7,11 @@
 {% block content %}
 
     <div class="container-fluid">
-        Create <a href='{{request.path}}create'>new</a><br/>
+        Create a new <a href='{{request.path}}create'>collection</a> / <a href="{% url 'atlas:user_collections' %}">Collections to view / take</a>
+
+
+
+        <h2>My Collections</h2>
         <details>
             <summary>
                 <h4>Filter</h4>
@@ -18,7 +22,7 @@
                     <input class="btn btn-primary btn-sm mt-1 mb-1" type="submit" />
                 </form>
             </div>
-        View my <a href='{% url "atlas:case_view" %}?author={{request.user.id}}'>cases</a>.
+            View my <a href='{% url "atlas:case_view" %}?author={{request.user.id}}'>cases</a>.
         </details>
         {% render_table table %}
     </div>

atlas/urls.py

@@ -111,6 +111,7 @@ urlpatterns = [
         views.GenericExamViews.exam_users_edit,
         name="exam_users_edit",
     ),
+    path("exam/<int:pk>/groups", views.ExamGroupsUpdate.as_view(), name="exam_groups_edit"),
     path(
         "collection/<int:exam_id>/case/<int:case_id>/details",
         views.collection_case_details,

atlas/views.py

@@ -47,6 +47,7 @@ from .forms import (
     CidReportAnswerMarkForm,
     ConditionAutocompleteForm,
     ConditionForm,
+    ExamGroupsForm,
     FindingForm,
     JsonAnswerForm,
     PriorCaseForm,
@@ -144,6 +145,7 @@ from django.forms.models import model_to_dict
 from generic.views import (
     AuthorRequiredMixin,
     ExamCloneMixin,
+    ExamGroupsUpdateBase,
     ExamViews,
     SeriesImagesZipViewBase,
 )
@@ -2713,6 +2715,15 @@ class CaseCollectionAuthorUpdate(RevisionMixin, AuthorRequiredMixin, UpdateView)
         context["collection"] = context["object"]
         return context
 
+class ExamGroupsUpdate(ExamGroupsUpdateBase):
+    model = CaseCollection
+    form_class = ExamGroupsForm
+
+    def get_context_data(self, **kwargs):
+        context = super(ExamGroupsUpdate, self).get_context_data(**kwargs)
+        context["exam"] = context["object"]
+        return context
+
 
 class CaseAuthorUpdate(RevisionMixin, AuthorRequiredMixin, UpdateView):
     model = Case
@@ -2816,8 +2827,12 @@ def collection_reset_answers(request, exam_id: int):
         case_details = collection.casedetail_set.all().prefetch_related()
 
         # Delete all answers
-        cid_answers = case_details.cidreportanswer_set.all()
+        for case in case_details:
-        user_answers = case_details.userreportanswer_set.all()
+            cid_answers = case.cidreportanswer_set.all()
+
+            cid_answers.delete()
+            user_answers = case.userreportanswer_set.all()
+            user_answers.delete()
 
         
         # User statuses
@@ -2825,6 +2840,7 @@ def collection_reset_answers(request, exam_id: int):
 
         # CidUserExams
         collection.cid_users.all().delete()
+        return HttpResponse("Success")
         
 
     else:

generic/models.py

@@ -789,7 +789,7 @@ class ExamOrCollectionGenericBase(models.Model, AuthorMixin):
         raise NotImplementedError
 
     def get_cid_user_exams(
-        self, cid_user: Optional["CidUser"] = None, user_user: User = None
+        self, cid_user: Optional["CidUser"] = None, user_user: User | None = None
     ) -> "CidUserExam":
         content_type = ContentType.objects.get_for_model(self)
         if cid_user is None and user_user is None:

physics/urls.py

@@ -34,6 +34,7 @@ urlpatterns.extend(
             name="exam_take_overview_user",
         ),
         path("exam/<int:pk>/markers", views.ExamMarkersUpdate.as_view(), name="exam_markers"),
+        path("exam/<int:pk>/groups", views.ExamGroupsUpdate.as_view(), name="exam_groups_edit"),
         path(
             "exam/<int:pk>/authors",
             views.ExamAuthorUpdate.as_view(),

rapids/urls.py

@@ -51,6 +51,7 @@ urlpatterns = [
         "exam/<int:exam_pk>/<int:sk>/mark/review", views.mark_review, name="mark_review"
     ),
     path("exam/<int:pk>/markers", views.ExamMarkersUpdate.as_view(), name="exam_markers"),
+    path("exam/<int:pk>/groups", views.ExamGroupsUpdate.as_view(), name="exam_groups_edit"),
     path("exam/<int:pk>/authors", views.ExamAuthorUpdate.as_view(), name="exam_authors"),
     path("exam/create", views.ExamCreate.as_view(), name="exam_create"),
     path("exam/<int:exam_id>/clone", views.ExamClone.as_view(), name="exam_clone"),

sbas/urls.py

@@ -50,6 +50,7 @@ urlpatterns = [
     ),
 
     path("exam/<int:pk>/markers", views.ExamMarkersUpdate.as_view(), name="exam_markers"),
+    path("exam/<int:pk>/groups", views.ExamGroupsUpdate.as_view(), name="exam_groups_edit"),
     path(
         "exam/<int:pk>/authors", views.ExamAuthorUpdate.as_view(), name="exam_authors"
     ),