From d046b7a151134e91c5c99c89957b7cde9a07ea99 Mon Sep 17 00:00:00 2001 From: Ross Date: Mon, 11 May 2026 11:06:51 +0100 Subject: [PATCH] Refactor code structure for improved readability and maintainability --- anatomy/static/js/anatomy.js | 6 + atlas/templates/atlas/base.html | 26 +- atlas/templates/atlas/new_uploads.html | 1713 +++++++++++++++--------- 3 files changed, 1116 insertions(+), 629 deletions(-) diff --git a/anatomy/static/js/anatomy.js b/anatomy/static/js/anatomy.js index e7cb87c5..52f206c2 100644 --- a/anatomy/static/js/anatomy.js +++ b/anatomy/static/js/anatomy.js @@ -212,6 +212,12 @@ window.loadDicomViewerEvent = new Event('loadDicomViewerUrls'); window.addEventListener('loadDicomViewerUrls', function (e) { console.log("LoadDicomViewer unls event", e.detail) + // Skip loading old viewer if using new dv3d viewer (set on new_uploads page) + if (window.skipLoadDicomViewer) { + console.log("Skipping old loadDicomViewer - using dv3d instead"); + return; + } + loadDicomViewer(e.detail.images, e.detail.annotations); }, false); diff --git a/atlas/templates/atlas/base.html b/atlas/templates/atlas/base.html index 37d7f547..046317ba 100755 --- a/atlas/templates/atlas/base.html +++ b/atlas/templates/atlas/base.html @@ -119,14 +119,26 @@ -
  • - Uploads +
  • + Uploads + +
    • - {% if request.user.is_staff %} -
  • - Hash Search -
    • - {% endif %}
  • Question Schemas
    • diff --git a/atlas/templates/atlas/new_uploads.html b/atlas/templates/atlas/new_uploads.html index 8eb3f732..d5acb145 100644 --- a/atlas/templates/atlas/new_uploads.html +++ b/atlas/templates/atlas/new_uploads.html @@ -1,44 +1,130 @@ {% extends 'atlas/base.html' %} - -{% load static%} +{% load static %} {% block content %} -

    Upload dicoms

    - User: {{user}}
    - -