ross/penracourses
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Improve sorting and normalization of study dates in user uploads

Browse Source 
Co-authored-by: Copilot <copilot@github.com>
This commit is contained in:
Ross
2026-04-29 21:36:20 +01:00
co-authored by Copilot
parent 082a260757
commit 8201f91697
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
atlas/views.py
+10 -2
View File
@@ -2280,14 +2280,22 @@ def user_uploads(
tags, date = data[series][0] tags, date = data[series][0]
series_list.append((series, len(data[series]), tags, date)) series_list.append((series, len(data[series]), tags, date))
series_list.sort(key=lambda l: l[-1]) series_list.sort(key=lambda l: l[-1] or "")
# Group series by StudyInstanceUID for better visual grouping in the template # Group series by StudyInstanceUID for better visual grouping in the template
grouped = {} grouped = {}
for series_uid, count, tags, date in series_list: for series_uid, count, tags, date in series_list:
study_uid = tags.get("StudyInstanceUID") or tags.get("StudyID") or "unknown" study_uid = tags.get("StudyInstanceUID") or tags.get("StudyID") or "unknown"
study_desc = tags.get("StudyDescription", "") study_desc = tags.get("StudyDescription", "")
study_date = tags.get("StudyDate", date) # Normalise to a sortable string; DICOM StudyDate is "YYYYMMDD", fall
# back to the upload's created_date converted to the same format.
raw_study_date = tags.get("StudyDate")
if raw_study_date:
study_date = str(raw_study_date)
elif hasattr(date, "strftime"):
study_date = date.strftime("%Y%m%d")
else:
study_date = str(date)
if study_uid not in grouped: if study_uid not in grouped:
grouped[study_uid] = { grouped[study_uid] = {
"description": study_desc, "description": study_desc,