start taking more advantage of class based views

atlas/models.py

@@ -5,7 +5,7 @@ import pathlib
 from typing import Tuple
 
 from django.http import Http404, HttpRequest
-from generic.mixins import AuthorMixin
+from generic.mixins import AuthorMixin, QuestionMixin
 from rad.settings import REMOTE_URL
 from django.db.models.fields.files import ImageField
 from django.db.models.fields.related import ForeignKey
@@ -273,7 +273,7 @@ class Structure(SynMixin, models.Model):
 
 
 @reversion.register
-class Case(models.Model, AuthorMixin):
+class Case(models.Model, AuthorMixin, QuestionMixin):
     # class SubspecialtyChoices(models.TextChoices):
     #    BREAST = "BR", _("Breast")
     #    CARDIAC = "CA", _("Cardiac")
@@ -364,6 +364,9 @@ class Case(models.Model, AuthorMixin):
         blank=True,
     )
 
+    def get_app_name(self):
+        return "atlas"
+
     # question_file = models.FileField(upload_to=question_file_directory_path, blank=True, null=True)
 
     def get_absolute_url(self):
@@ -373,6 +376,10 @@ class Case(models.Model, AuthorMixin):
         # return f"{self.pk}: {self.title}"
         return format_html("<a href='{}'>{}</a>", self.get_absolute_url(), str(self))
 
+    #def get_base_template(self):
+
+    #def get_edit_template_links(self):
+
     def __str__(self):
         return f"{self.pk}: {self.title}"
 
@@ -773,6 +780,12 @@ class CaseCollection(ExamOrCollectionGenericBase):
         default=VIEWER_MODE_CHOICES.BUILT_IN,
     )
 
+    def get_app_name(self):
+        return "atlas"
+
+    def get_link_headers(self):
+        return f"{self.get_app_name()}/collection_headers.html"
+
     def get_absolute_url(self):
         return reverse("atlas:collection_detail", kwargs={"pk": self.pk})
 

atlas/templates/atlas/case_detail.html

@@ -3,33 +3,7 @@
 {% block content %}
 
 
-
-    <div class="floating-header">
-        <a href="{% url 'atlas:case_update' pk=case.pk %}" title="Edit the Case">Edit</a>
-        <a href="{% url 'atlas:case_clone' pk=case.pk %}"
-            title="Clone the Case (duplicate everything but the images)">Clone</a>
-        <a href="{% url 'atlas:case_delete' pk=case.pk %}" title="Delete the Case">Delete</a>
-        <a href="#"
-            onclick="return window.create_popup_window('{% url 'feedback_create' question_type='atlas' pk=case.pk %}')"> Add
-            Note</a>
-        <a href="{% url 'atlas:case_authors' case.pk %}" title="Edit Authors">Authors</a>
-        {% if request.user.is_superuser %}
-            <a href="{% url 'admin:atlas_case_change' case.id %}" title="Edit the Case using the admin interface">Admin Edit</a>
-        {% endif %}
-
-        {% if collection %}
-            <div>
-
-                {% if previous %}
-                    <a href="{% url 'atlas:collection_case_view' collection.id case_number|add:-1 %}">Previous question</a>
-                {% endif %}
-                Viewing question as part of collection: <a href="{% url 'atlas:collection_detail' collection.id %}">{{collection.name}}</a> [{{case_number|add:1}}/{{collection_length}}]
-                {% if next %}
-                    <a href="{% url 'atlas:collection_case_view' collection.id case_number|add:1 %}">Next question</a>
-                {% endif %}
-            </div>
-        {% endif %}
-    </div>
+    {% include 'atlas/question_link_header.html' %}
 
 
     {% include 'atlas/case_display_block.html' %}

atlas/templates/atlas/case_form.html

@@ -49,6 +49,10 @@
     <!-- {{ form.media }} -->
 {% endblock %}
 {% block content %}
+    {% if object %}
+        {% include "atlas/question_link_header.html" %}
+    {% endif %}
+
     <h2>Submit Case</h2>
     Use this form to create a atlas case. Existing associated image sets can be added using this form.
 

atlas/templates/atlas/collection_headers.html

@@ -1,15 +1,14 @@
-
 {% if request.user.is_authenticated %}
     <br/>Collection: {{collection.name}}-> <a href="{% url 'atlas:collection_detail' pk=collection.pk %}">Overview</a> /
     <a href="{% url 'atlas:collection_mark_overview' collection.pk %}">Mark</a> /
     <a href="{% url 'atlas:collection_scores_cid' collection.pk %}">Scores</a> /
     <a href="{% url 'atlas:exam_cids' collection.pk %}">Candidates</a> /
     <a href="{% url 'atlas:atlas_create_exam' pk=collection.pk %}">Add New Case</a> /
-    <a href="{% url 'atlas:collection_authors' collection.pk %}" title="Edit Authors">Authors</a>
     <div class="floating-header">
         <a href="{% url 'atlas:exam_update' collection.id %}" title="Edit the Collection">Edit</a>
         \ <a href="{% url 'atlas:exam_deleted' collection.id %}" title="Delete the Collection">Delete</a>
         \ <a href="{% url 'atlas:exam_clone' collection.id %}" title="Clone the Collection">Clone</a>
+        \ <a href="{% url 'atlas:collection_authors' collection.pk %}" title="Edit Authors">Authors</a>
 
         {% if request.user.is_superuser %}
             \ <a href="{% url 'admin:atlas_casecollection_change' collection.id %}" title="Edit the Collection using the admin interface">Admin Edit</a>

atlas/templates/atlas/question_link_header.html

@@ -0,0 +1,26 @@
+    <div class="floating-header">
+        <a href="{% url 'atlas:case_update' pk=case.pk %}" title="Edit the Case">Edit</a>
+        <a href="{% url 'atlas:case_clone' pk=case.pk %}"
+            title="Clone the Case (duplicate everything but the images)">Clone</a>
+        <a href="{% url 'atlas:case_delete' pk=case.pk %}" title="Delete the Case">Delete</a>
+        <a href="#"
+            onclick="return window.create_popup_window('{% url 'feedback_create' question_type='atlas' pk=case.pk %}')"> Add
+            Note</a>
+        <a href="{% url 'atlas:case_authors' case.pk %}" title="Edit Authors">Authors</a>
+        {% if request.user.is_superuser %}
+            <a href="{% url 'admin:atlas_case_change' case.id %}" title="Edit the Case using the admin interface">Admin Edit</a>
+        {% endif %}
+
+        {% if collection %}
+            <div>
+
+                {% if previous %}
+                    <a href="{% url 'atlas:collection_case_view' collection.id case_number|add:-1 %}">Previous question</a>
+                {% endif %}
+                Viewing question as part of collection: <a href="{% url 'atlas:collection_detail' collection.id %}">{{collection.name}}</a> [{{case_number|add:1}}/{{collection_length}}]
+                {% if next %}
+                    <a href="{% url 'atlas:collection_case_view' collection.id case_number|add:1 %}">Next question</a>
+                {% endif %}
+            </div>
+        {% endif %}
+    </div>

atlas/views.py

@@ -2247,7 +2247,17 @@ class CaseCollectionAuthorUpdate(RevisionMixin, AuthorRequiredMixin, UpdateView)
     form_class = CaseCollectionAuthorForm
     template_name = "author_form.html"
 
+    def get_context_data(self, **kwargs):
+        context = super(CaseCollectionAuthorUpdate, self).get_context_data(**kwargs)
+        context["collection"] = context["object"]
+        return context
+
 class CaseAuthorUpdate(RevisionMixin, AuthorRequiredMixin, UpdateView):
     model = Case
     form_class = CaseAuthorForm
-    template_name = "author_form.html"
+    template_name = "author_form.html"
+
+    def get_context_data(self, **kwargs):
+        context = super(CaseAuthorUpdate, self).get_context_data(**kwargs)
+        context["collection"] = context["object"]
+        return context