Refactor code structure for improved readability and maintainability
This commit is contained in:
Ross
+27
-10
@@ -617,20 +617,37 @@ class Case(models.Model, AuthorMixin, QuestionMixin):
|
||||
cimar_uuid = models.CharField(max_length=255, null=True, blank=True)
|
||||
|
||||
def get_ordered_series_details(self):
|
||||
# If the series are already prefetched, use them directly
|
||||
if hasattr(self, '_prefetched_objects_cache') and 'series' in self._prefetched_objects_cache:
|
||||
# Get the through model and sort by sort_order
|
||||
through_model = self.series.through
|
||||
# Build a mapping from series pk to through instance
|
||||
through_objs = list(through_model.objects.filter(case=self).select_related('series'))
|
||||
through_objs.sort(key=lambda x: x.sort_order)
|
||||
cached = getattr(self, "_ordered_series_details_cache", None)
|
||||
if cached is not None:
|
||||
return cached
|
||||
|
||||
prefetched = getattr(self, "_prefetched_objects_cache", {})
|
||||
if "seriesdetail_set" in prefetched:
|
||||
through_objs = sorted(
|
||||
list(prefetched["seriesdetail_set"]),
|
||||
key=lambda item: item.sort_order,
|
||||
)
|
||||
self._ordered_series_details_cache = through_objs
|
||||
return through_objs
|
||||
# Otherwise, query as before
|
||||
return self.series.through.objects.filter(case=self).select_related('series').order_by('sort_order')
|
||||
|
||||
through_objs = list(
|
||||
self.series.through.objects
|
||||
.filter(case=self)
|
||||
.select_related("series")
|
||||
.order_by("sort_order")
|
||||
)
|
||||
self._ordered_series_details_cache = through_objs
|
||||
return through_objs
|
||||
|
||||
def get_ordered_series(self):
|
||||
"""Returns the series in the case in order of the SeriesDetail sort_order"""
|
||||
return [sd.series for sd in self.get_ordered_series_details()]
|
||||
cached = getattr(self, "_ordered_series_cache", None)
|
||||
if cached is not None:
|
||||
return cached
|
||||
|
||||
ordered = [sd.series for sd in self.get_ordered_series_details()]
|
||||
self._ordered_series_cache = ordered
|
||||
return ordered
|
||||
|
||||
def get_app_name(self):
|
||||
return "atlas"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{% load case_widgets %}
|
||||
|
||||
{% partialdef case-series %}
|
||||
{% for series in case.get_ordered_series %}
|
||||
{% for series in ordered_series %}
|
||||
<article class="series-block series-block-interactive"
|
||||
id="series-block-{{ series.pk }}"
|
||||
data-series-id="{{series.pk}}"
|
||||
@@ -32,7 +32,7 @@
|
||||
<div class="series-card-content">
|
||||
<div class="series-card-heading">
|
||||
<span class="series-card-series-number">Series {{ forloop.counter }}</span>
|
||||
<span class="series-card-image-count">{{ series.images.count }} image{{ series.images.count|pluralize }}</span>
|
||||
<span class="series-card-image-count">{{ series.visible_image_count }} image{{ series.visible_image_count|pluralize }}</span>
|
||||
</div>
|
||||
<div class="series-card-description">{{ series.description|default:"No description" }}</div>
|
||||
</div>
|
||||
@@ -506,7 +506,7 @@
|
||||
<summary class="series-panel-summary">
|
||||
<span class="series-panel-title">Series</span>
|
||||
<span class="series-panel-summary-actions">
|
||||
<span class="series-panel-badge">{{ case.get_ordered_series|length }} total</span>
|
||||
<span class="series-panel-badge">{{ ordered_series|length }} total</span>
|
||||
<button type="button"
|
||||
class="btn btn-outline-primary btn-sm series-summary-btn"
|
||||
id="series-import-uploads-btn"
|
||||
@@ -542,157 +542,156 @@
|
||||
</div>
|
||||
<div class="series-actions" id="series-actions">
|
||||
<div class="series-actions-body">
|
||||
<a class="btn btn-sm btn-outline-secondary text-start" href="{% url 'atlas:series_id_create' pk=case.pk %}">Create and add new series</a>
|
||||
<div class="series-actions-toolbar">
|
||||
<a class="btn btn-sm btn-outline-secondary" href="{% url 'atlas:series_id_create' pk=case.pk %}">Create and add new series</a>
|
||||
<button type="button"
|
||||
class="btn btn-sm btn-secondary"
|
||||
data-bs-toggle="modal"
|
||||
data-bs-target="#reorderSeriesModal">
|
||||
Reorder series
|
||||
</button>
|
||||
<button type="button" class="btn btn-sm btn-outline-primary" id="series-select-all-btn">Select all</button>
|
||||
<button type="button" class="btn btn-sm btn-outline-secondary" id="series-deselect-all-btn">Deselect all</button>
|
||||
</div>
|
||||
|
||||
<div class="series-selection-toolbar d-flex flex-wrap gap-2">
|
||||
<button type="button" class="btn btn-sm btn-outline-primary" id="series-select-all-btn">Select all</button>
|
||||
<button type="button" class="btn btn-sm btn-outline-secondary" id="series-deselect-all-btn">Deselect all</button>
|
||||
</div>
|
||||
<div class="series-actions-grid">
|
||||
<button class="btn btn-sm btn-outline-secondary text-start" hx-get="{% url 'atlas:case_order_dicom' pk=case.pk %}"
|
||||
title="order dicom by slice location"
|
||||
hx-target="#series-action-results"
|
||||
hx-swap="innerHTML"
|
||||
hx-confirm="This will reorder all case series based upon slice location"
|
||||
>
|
||||
Order dicoms by slice location
|
||||
</button>
|
||||
<button class="btn btn-sm btn-outline-primary text-start" hx-post="{% url 'atlas:combine_series' %}"
|
||||
title="merge series"
|
||||
hx-include="[name='series-ids']"
|
||||
hx-target="#series-action-results"
|
||||
hx-swap="innerHTML"
|
||||
hx-confirm="This will merge all selected series into one"
|
||||
>
|
||||
Merge selected series
|
||||
</button>
|
||||
<button class="btn btn-sm btn-outline-secondary text-start" hx-post="{% url 'atlas:use_dates_as_descriptions' case.pk %}"
|
||||
title="use dicom dates as series descriptions"
|
||||
hx-include="[name='series-ids']"
|
||||
hx-target="#series-action-results"
|
||||
hx-swap="innerHTML"
|
||||
hx-confirm="This will use the dicom date as the series description"
|
||||
>
|
||||
Use dates as description
|
||||
</button>
|
||||
<button hx-post="{% url 'atlas:remove_selected_series_from_case' case.pk %}"
|
||||
title="remove selected series from this case"
|
||||
hx-include="[name='series-ids']:checked"
|
||||
hx-target="#series-action-results"
|
||||
hx-swap="innerHTML"
|
||||
hx-confirm="Are you sure you want to remove the selected series from this case? They will not be deleted from the database."
|
||||
class="btn btn-sm btn-warning text-start"
|
||||
type="button"
|
||||
>
|
||||
Remove selected series from case
|
||||
</button>
|
||||
<button hx-post="{% url 'atlas:series_bulk_delete' %}"
|
||||
id="series-delete-selected-btn"
|
||||
title="delete selected series"
|
||||
hx-include="[name='series-ids']:checked"
|
||||
hx-target="#series-action-results"
|
||||
hx-swap="innerHTML"
|
||||
hx-indicator="#series-delete-indicator"
|
||||
hx-confirm="Delete the selected series from the database? This cannot be undone."
|
||||
class="btn btn-sm btn-danger text-start"
|
||||
type="button">
|
||||
Delete selected series
|
||||
</button>
|
||||
<span id="series-delete-indicator" class="htmx-indicator small text-danger">
|
||||
<span class="spinner-border spinner-border-sm me-1" role="status" aria-hidden="true"></span>
|
||||
Deleting...
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<div class="series-actions-grid d-flex flex-column gap-2">
|
||||
<button class="btn btn-sm btn-outline-secondary text-start" hx-get="{% url 'atlas:case_order_dicom' pk=case.pk %}"
|
||||
title="order dicom by slice location"
|
||||
hx-target="#series-action-results"
|
||||
hx-swap="innerHTML"
|
||||
hx-confirm="This will reorder all case series based upon slice location"
|
||||
>
|
||||
Order dicoms by slice location
|
||||
</button>
|
||||
<button class="btn btn-sm btn-outline-primary text-start" hx-post="{% url 'atlas:combine_series' %}"
|
||||
title="merge series"
|
||||
hx-include="[name='series-ids']"
|
||||
hx-target="#series-action-results"
|
||||
hx-swap="innerHTML"
|
||||
hx-confirm="This will merge all selected series into one"
|
||||
>
|
||||
Merge selected series
|
||||
</button>
|
||||
<button class="btn btn-sm btn-outline-secondary text-start" hx-post="{% url 'atlas:use_dates_as_descriptions' case.pk %}"
|
||||
title="use dicom dates as series descriptions"
|
||||
hx-include="[name='series-ids']"
|
||||
hx-target="#series-action-results"
|
||||
hx-swap="innerHTML"
|
||||
hx-confirm="This will use the dicom date as the series description"
|
||||
>
|
||||
Use dates as description
|
||||
</button>
|
||||
<button hx-post="{% url 'atlas:remove_selected_series_from_case' case.pk %}"
|
||||
title="remove selected series from this case"
|
||||
hx-include="[name='series-ids']:checked"
|
||||
hx-target="#series-action-results"
|
||||
hx-swap="innerHTML"
|
||||
hx-confirm="Are you sure you want to remove the selected series from this case? They will not be deleted from the database."
|
||||
class="btn btn-sm btn-warning text-start"
|
||||
type="button"
|
||||
>
|
||||
Remove selected series from case
|
||||
</button>
|
||||
<button hx-post="{% url 'atlas:series_bulk_delete' %}"
|
||||
id="series-delete-selected-btn"
|
||||
title="delete selected series"
|
||||
hx-include="[name='series-ids']:checked"
|
||||
hx-target="#series-action-results"
|
||||
hx-swap="innerHTML"
|
||||
hx-indicator="#series-delete-indicator"
|
||||
hx-confirm="Delete the selected series from the database? This cannot be undone."
|
||||
class="btn btn-sm btn-danger text-start"
|
||||
type="button">
|
||||
Delete selected series
|
||||
</button>
|
||||
<span id="series-delete-indicator" class="htmx-indicator small text-danger">
|
||||
<span class="spinner-border spinner-border-sm me-1" role="status" aria-hidden="true"></span>
|
||||
Deleting...
|
||||
</span>
|
||||
<button type="button"
|
||||
class="btn btn-sm btn-secondary text-start"
|
||||
data-bs-toggle="modal"
|
||||
data-bs-target="#reorderSeriesModal">
|
||||
Reorder series
|
||||
</button>
|
||||
</div>
|
||||
<details class="series-move-panel border rounded p-2">
|
||||
<summary class="small fw-semibold">Move selected series to another case</summary>
|
||||
{% if move_series_form %}
|
||||
<form id="move-selected-series-form" class="d-flex flex-column gap-2 mt-2">
|
||||
{{ move_series_form.destination_case }}
|
||||
<div class="small text-muted">Click any case row below to select the destination case.</div>
|
||||
<div id="selected-move-case" class="small text-muted">No destination case selected.</div>
|
||||
{% case_search_widget collection=None recent_cases=move_series_recent_cases input_id='move-series-case-search-input' target_id='move-series-case-search-results' show_select_button=True %}
|
||||
<button type="button"
|
||||
id="move-selected-series-submit"
|
||||
class="btn btn-sm btn-outline-primary text-start"
|
||||
disabled
|
||||
hx-post="{% url 'atlas:move_selected_series_to_case' case.pk %}"
|
||||
hx-include="[name='series-ids']:checked, #move-selected-series-form [name='destination_case']"
|
||||
hx-target="#series-action-results"
|
||||
hx-swap="innerHTML"
|
||||
hx-confirm="Move selected series to the chosen destination case?">
|
||||
Move selected series
|
||||
</button>
|
||||
</form>
|
||||
<script>
|
||||
(function () {
|
||||
if (window.__moveSeriesCaseSelectionBound) return;
|
||||
window.__moveSeriesCaseSelectionBound = true;
|
||||
|
||||
<details class="series-move-panel border rounded p-2">
|
||||
<summary class="small fw-semibold">Move selected series to another case</summary>
|
||||
{% if move_series_form %}
|
||||
<form id="move-selected-series-form" class="d-flex flex-column gap-2 mt-2">
|
||||
{{ move_series_form.destination_case }}
|
||||
<div class="small text-muted">Click any case row below to select the destination case.</div>
|
||||
<div id="selected-move-case" class="small text-muted">No destination case selected.</div>
|
||||
{% case_search_widget collection=None input_id='move-series-case-search-input' target_id='move-series-case-search-results' show_select_button=True %}
|
||||
<button type="button"
|
||||
id="move-selected-series-submit"
|
||||
class="btn btn-sm btn-outline-primary text-start"
|
||||
disabled
|
||||
hx-post="{% url 'atlas:move_selected_series_to_case' case.pk %}"
|
||||
hx-include="[name='series-ids']:checked, #move-selected-series-form [name='destination_case']"
|
||||
hx-target="#series-action-results"
|
||||
hx-swap="innerHTML"
|
||||
hx-confirm="Move selected series to the chosen destination case?">
|
||||
Move selected series
|
||||
</button>
|
||||
</form>
|
||||
<script>
|
||||
(function () {
|
||||
if (window.__moveSeriesCaseSelectionBound) return;
|
||||
window.__moveSeriesCaseSelectionBound = true;
|
||||
function applyMoveCaseSelection(casePk, caseTitle) {
|
||||
if (!casePk) return;
|
||||
|
||||
function applyMoveCaseSelection(casePk, caseTitle) {
|
||||
if (!casePk) return;
|
||||
const form = document.getElementById('move-selected-series-form');
|
||||
const hiddenInput = form ? form.querySelector("[name='destination_case']") : null;
|
||||
const label = document.getElementById('selected-move-case');
|
||||
const results = document.getElementById('move-series-case-search-results');
|
||||
if (!hiddenInput) return;
|
||||
|
||||
const form = document.getElementById('move-selected-series-form');
|
||||
const hiddenInput = form ? form.querySelector("[name='destination_case']") : null;
|
||||
const label = document.getElementById('selected-move-case');
|
||||
const results = document.getElementById('move-series-case-search-results');
|
||||
if (!hiddenInput) return;
|
||||
|
||||
hiddenInput.value = casePk;
|
||||
if (label) {
|
||||
label.innerHTML = 'Selected destination: <strong>' + caseTitle + ' (' + casePk + ')</strong>';
|
||||
label.classList.remove('text-muted');
|
||||
}
|
||||
|
||||
if (results) {
|
||||
results.querySelectorAll('.list-group-item[data-case-pk]').forEach(function (item) {
|
||||
item.classList.toggle('active', String(item.getAttribute('data-case-pk')) === String(casePk));
|
||||
});
|
||||
}
|
||||
|
||||
syncMoveSeriesSubmitState();
|
||||
hiddenInput.value = casePk;
|
||||
if (label) {
|
||||
label.innerHTML = 'Selected destination: <strong>' + caseTitle + ' (' + casePk + ')</strong>';
|
||||
label.classList.remove('text-muted');
|
||||
}
|
||||
|
||||
function syncMoveSeriesSubmitState() {
|
||||
const form = document.getElementById('move-selected-series-form');
|
||||
const hiddenInput = form ? form.querySelector("[name='destination_case']") : null;
|
||||
const submitBtn = document.getElementById('move-selected-series-submit');
|
||||
if (!hiddenInput || !submitBtn) return;
|
||||
submitBtn.disabled = !hiddenInput.value;
|
||||
if (results) {
|
||||
results.querySelectorAll('.list-group-item[data-case-pk]').forEach(function (item) {
|
||||
item.classList.toggle('active', String(item.getAttribute('data-case-pk')) === String(casePk));
|
||||
});
|
||||
}
|
||||
|
||||
document.body.addEventListener('case:selected', function (e) {
|
||||
try {
|
||||
const detail = e.detail || {};
|
||||
const casePk = detail.casePk;
|
||||
const caseTitle = detail.caseTitle || ('Case #' + casePk);
|
||||
applyMoveCaseSelection(casePk, caseTitle);
|
||||
} catch (err) {
|
||||
console.error('Move series case:selected handler error', err);
|
||||
}
|
||||
});
|
||||
|
||||
syncMoveSeriesSubmitState();
|
||||
})();
|
||||
</script>
|
||||
{% else %}
|
||||
<div class="text-muted small mt-2">Case move options are unavailable in this view.</div>
|
||||
{% endif %}
|
||||
</details>
|
||||
}
|
||||
|
||||
function syncMoveSeriesSubmitState() {
|
||||
const form = document.getElementById('move-selected-series-form');
|
||||
const hiddenInput = form ? form.querySelector("[name='destination_case']") : null;
|
||||
const submitBtn = document.getElementById('move-selected-series-submit');
|
||||
if (!hiddenInput || !submitBtn) return;
|
||||
submitBtn.disabled = !hiddenInput.value;
|
||||
}
|
||||
|
||||
document.body.addEventListener('case:selected', function (e) {
|
||||
try {
|
||||
const detail = e.detail || {};
|
||||
const casePk = detail.casePk;
|
||||
const caseTitle = detail.caseTitle || ('Case #' + casePk);
|
||||
applyMoveCaseSelection(casePk, caseTitle);
|
||||
} catch (err) {
|
||||
console.error('Move series case:selected handler error', err);
|
||||
}
|
||||
});
|
||||
|
||||
syncMoveSeriesSubmitState();
|
||||
})();
|
||||
</script>
|
||||
{% else %}
|
||||
<div class="text-muted small mt-2">Case move options are unavailable in this view.</div>
|
||||
{% endif %}
|
||||
</details>
|
||||
</div>
|
||||
<div class="alert alert-info mt-2" id="series-action-alert" style="display:none;">
|
||||
<span id="series-action-results" ></span>
|
||||
</div>
|
||||
<div class="alert alert-info mt-2" id="series-action-alert" style="display:none;">
|
||||
<span id="series-action-results" ></span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="container">
|
||||
|
||||
@@ -1010,7 +1009,7 @@
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<ul id="series-reorder-list" class="list-group">
|
||||
{% for series in case.get_ordered_series %}
|
||||
{% for series in ordered_series %}
|
||||
<li class="list-group-item d-flex justify-content-between align-items-center" data-series-id="{{ series.pk }}">
|
||||
<span>
|
||||
<span class="series-block-series-number">Series {{ forloop.counter }}:</span>
|
||||
@@ -2085,13 +2084,24 @@
|
||||
flex-direction: column;
|
||||
gap: .5rem;
|
||||
}
|
||||
.series-selection-toolbar {
|
||||
.series-actions-toolbar {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: .5rem;
|
||||
border-top: 1px solid rgba(0,0,0,0.08);
|
||||
border-bottom: 1px solid rgba(0,0,0,0.08);
|
||||
padding: .5rem 0;
|
||||
}
|
||||
.series-actions-grid {
|
||||
display: grid;
|
||||
gap: .5rem;
|
||||
grid-template-columns: repeat(auto-fit, minmax(240px, 1fr));
|
||||
align-items: stretch;
|
||||
}
|
||||
.series-actions-toolbar .btn {
|
||||
flex: 1 1 220px;
|
||||
}
|
||||
.series-actions-grid .btn,
|
||||
.series-actions-body > a.btn,
|
||||
.series-move-panel .btn {
|
||||
width: 100%;
|
||||
}
|
||||
@@ -2149,6 +2159,9 @@
|
||||
padding-right: .5rem;
|
||||
padding-bottom: .5rem;
|
||||
}
|
||||
.series-actions-toolbar .btn {
|
||||
flex-basis: calc(50% - .25rem);
|
||||
}
|
||||
}
|
||||
@media (max-width: 575.98px) {
|
||||
.series-block {
|
||||
@@ -2165,6 +2178,9 @@
|
||||
.series-actions-panel-inner {
|
||||
padding: .75rem;
|
||||
}
|
||||
.series-actions-toolbar .btn {
|
||||
flex-basis: 100%;
|
||||
}
|
||||
}
|
||||
@media (prefers-color-scheme: dark) {
|
||||
.series-actions { background: rgba(255,255,255,0.02); border-color: rgba(255,255,255,0.04); }
|
||||
|
||||
@@ -1535,11 +1535,13 @@ def case_displaysets_delete(request, pk):
|
||||
|
||||
|
||||
def get_case_for_case_detail(pk: int) -> Case:
|
||||
"""Return a case with eager-loaded relations used by the case detail page."""
|
||||
try:
|
||||
case = (
|
||||
Case.objects
|
||||
.select_related() # Add any FK fields if needed
|
||||
.prefetch_related(
|
||||
Prefetch("author", queryset=User.objects.all()),
|
||||
Prefetch(
|
||||
"seriesdetail_set",
|
||||
queryset=SeriesDetail.objects.select_related("series").order_by("sort_order").prefetch_related(
|
||||
@@ -1581,9 +1583,26 @@ def get_case_for_case_detail(pk: int) -> Case:
|
||||
@login_required
|
||||
@user_has_case_view_access
|
||||
def case_detail(request, pk):
|
||||
"""Render the Atlas case detail page with precomputed series and move targets."""
|
||||
case = get_case_for_case_detail(pk)
|
||||
can_edit = case.check_user_can_edit(request.user)
|
||||
move_series_form = MoveSelectedSeriesForm(user=request.user, source_case=case)
|
||||
ordered_series = list(getattr(case, "ordered_series", case.get_ordered_series()))
|
||||
|
||||
for series in ordered_series:
|
||||
prefetched_images = getattr(series, "_prefetched_objects_cache", {}).get("images")
|
||||
if prefetched_images is not None:
|
||||
series.visible_image_count = len(prefetched_images)
|
||||
else:
|
||||
series.visible_image_count = series.images.filter(removed=False).count()
|
||||
|
||||
move_series_recent_cases = list(
|
||||
get_cases_available_to_user(request.user)
|
||||
.exclude(pk=case.pk)
|
||||
.filter(author=request.user)
|
||||
.order_by("-created_date")
|
||||
.prefetch_related("author", "condition", "presentation", "subspecialty")[:5]
|
||||
)
|
||||
|
||||
|
||||
return render(
|
||||
@@ -1594,6 +1613,8 @@ def case_detail(request, pk):
|
||||
"cimar_sid": request.user.userprofile.cimar_sid,
|
||||
"can_edit": can_edit,
|
||||
"move_series_form": move_series_form,
|
||||
"move_series_recent_cases": move_series_recent_cases,
|
||||
"ordered_series": ordered_series,
|
||||
# Provide helper lists for resource search filters
|
||||
"site_queryset": Site.objects.all(),
|
||||
"subspecialty_queryset": Subspecialty.objects.all(),
|
||||
|
||||
Reference in New Issue
Block a user