improve case form

atlas/forms.py

@@ -533,6 +533,13 @@ class CaseSeriesForm(ModelForm):
         else:
             queryset = Series.objects.all()
 
+        # Optimize the queryset for the ModelChoiceField
+        queryset = queryset.select_related(
+            "modality"
+        ).prefetch_related(
+            "examination", "plane", "contrast", "images"
+        )
+
         self.fields["series"] = ModelChoiceField(
             required=False,
             queryset=queryset,
@@ -541,7 +548,6 @@ class CaseSeriesForm(ModelForm):
 
 
 
-
 class CaseCollectionCaseForm(ModelForm):
     def __init__(self, *args, user, collection=None, **kwargs):
         super(CaseCollectionCaseForm, self).__init__(*args, **kwargs)

atlas/templates/atlas/case_form.html

@@ -143,51 +143,87 @@
 
         {% comment %} {{ form }} {% endcomment %}
 
-        <h3>Series:</h3>
-        Add image sets here. These can only be added once created (they can also be added to cases on creation).
-        <input type="button" value="Add More Series" id="add_more_series">
-        <div id="series_formset" class="list_formset">
-            <ol>
-                {% for form in series_formset %}
-                    <li class="no-error series-formset">
-                        {{form.non_field_errors}}
-                        {{form.errors}}
-                        {{ form | crispy}}
-                    </li>
-                {% endfor %}
-            </ol>
+<!-- Series Collapsible Panel (Dark Themed) -->
+<div class="card my-3 bg-dark text-white">
+    <div class="card-header">
+        <a class="collapsed text-white" data-bs-toggle="collapse" href="#seriesPanel" role="button" aria-expanded="false" aria-controls="seriesPanel">
+            <h3 class="d-inline">Series</h3>
+            <span class="ms-2">(click to expand/collapse)</span>
+        </a>
+    </div>
+    <div class="collapse" id="seriesPanel">
+        <input type="button" value="Add More Series" id="add_more_series" class="btn btn-sm btn-light float-end">
+        <div class="card-body bg-dark text-white">
+            <p>Add image sets here. These can only be added once created (they can also be added to cases on creation).</p>
+            <div id="series_formset" class="list_formset">
+                <ol>
+                    {% for form in series_formset %}
+                        <li class="no-error series-formset">
+                            {{form.non_field_errors}}
+                            {{form.errors}}
+                            {{ form | crispy}}
+                        </li>
+                    {% endfor %}
+                </ol>
+            </div>
+            {{ series_formset.management_form | crispy }}
         </div>
-        {{ series_formset.management_form | crispy }}
-        <h3>Differential:</h3>
-        Add differential here.
-        <input type="button" value="Add Another Differential" id="add_more_differential">
-        <div id="casedifferential_formset" class="list_formset">
-            <ol>
-                {% for form in casedifferential_formset %}
-                    <li class="no-error casedifferential_formset">
-                        {{form.non_field_errors}}
-                        {{form.errors}}
-                        {{ form  | crispy}}
-                    </li>
-                {% endfor %}
-            </ol>
+    </div>
+</div>
+
+<!-- Differential Collapsible Panel -->
+<div class="card my-3 bg-dark text-white">
+    <div class="card-header">
+        <a class="collapsed text-white" data-bs-toggle="collapse" href="#differentialPanel" role="button" aria-expanded="false" aria-controls="differentialPanel">
+            <h3 class="d-inline">Differential</h3>
+            <span class="ms-2">(click to expand/collapse)</span>
+        </a>
+    </div>
+    <div class="collapse" id="differentialPanel">
+        <input type="button" value="Add Another Differential" id="add_more_differential" class="btn btn-sm btn-primary float-end">
+        <div class="card-body">
+            <div id="casedifferential_formset" class="list_formset">
+                <ol>
+                    {% for form in casedifferential_formset %}
+                        <li class="no-error casedifferential_formset">
+                            {{form.non_field_errors}}
+                            {{form.errors}}
+                            {{ form  | crispy}}
+                        </li>
+                    {% endfor %}
+                </ol>
+            </div>
+            {{ casedifferential_formset.management_form | crispy }}
         </div>
-        {{ casedifferential_formset.management_form | crispy }}
-        <h3>Resource:</h3>
-        Add resource here. Resource can be anything that is useful for the case (videos, pdf, etc). This can either be avalaible before attempting the case (such a for a pre reading list) or after.
-        <input type="button" value="Add Another Resource" id="add_more_resource">
-        <div id="caseresource_formset" class="list_formset">
-            <ol>
-                {% for form in caseresource_formset %}
-                    <li class="no-error caseresource_formset">
-                        {{form.non_field_errors}}
-                        {{form.errors}}
-                        {{ form  | crispy}}
-                    </li>
-                {% endfor %}
-            </ol>
+    </div>
+</div>
+
+<!-- Resource Collapsible Panel -->
+<div class="card my-3 bg-dark text-white">
+    <div class="card-header">
+        <a class="collapsed text-white" data-bs-toggle="collapse" href="#resourcePanel" role="button" aria-expanded="false" aria-controls="resourcePanel">
+            <h3 class="d-inline">Resource</h3>
+            <span class="ms-2">(click to expand/collapse)</span>
+        </a>
+    </div>
+    <div class="collapse" id="resourcePanel">
+        <input type="button" value="Add Another Resource" id="add_more_resource" class="btn btn-sm btn-primary float-end">
+        <div class="card-body">
+            <div id="caseresource_formset" class="list_formset">
+                <ol>
+                    {% for form in caseresource_formset %}
+                        <li class="no-error caseresource_formset">
+                            {{form.non_field_errors}}
+                            {{form.errors}}
+                            {{ form  | crispy}}
+                        </li>
+                    {% endfor %}
+                </ol>
+            </div>
+            {{ caseresource_formset.management_form  | crispy}}
         </div>
-        {{ caseresource_formset.management_form  | crispy}}
+    </div>
+</div>
         <br/>
         <input type="submit" class="submit-button" value="Submit" name="submit">
     </form>

atlas/views.py

@@ -1052,6 +1052,25 @@ class AtlasUpdate(
     #    #initial = {'date_of_death': '05/01/2018'}
     #    exclude = [ 'created_date', 'published_date' ]
 
+
+    #def get_object(self, queryset=None):
+    #    # Prefetch all related objects needed for the form and formsets
+    #    qs = self.model.objects.select_related(
+    #        # Add all FK fields here
+    #    ).prefetch_related(
+    #        "series__examination",
+    #        "series__plane",
+    #        "series__contrast",
+    #        "series__images",
+    #        "subspecialty",
+    #        "condition",
+    #        "presentation",
+    #        "pathological_process",
+    #        "differentialcase",
+    #        "caseresource_set",
+    #    )
+    #    return qs.get(pk=self.kwargs["pk"])
+
     def get_form_kwargs(self):
         kwargs = super(AtlasUpdate, self).get_form_kwargs()
         kwargs.update({"user": self.request.user})