Upload feature

README.md

@@ -43,9 +43,6 @@ ADIT (Automated DICOM Transfer) is a Swiss army knife to exchange DICOM data bet
 - Define when transfers should happen (for example, more workers at night to reduce server load on a PACS)
 - Fine-grained control of what users can or can't do and what they can access
 - Help modals with detailed information for the most important features
-
-## Upcoming features
-
 - An upload portal to upload DICOM images through a web interface that can be pseudonymized on the client (before the transfer happens)
 
 ## API Client

adit/core/widgets.py

@@ -13,7 +13,10 @@ def create_option(self, name, value, label, selected, index, subindex=None, attr
             dicom_node = value.instance
             if dicom_node.node_type == DicomNode.NodeType.SERVER:
                 option["attrs"]["data-node_type"] = "server"
+                option["attrs"]["data-node_id"] = dicom_node.id
             elif dicom_node.node_type == DicomNode.NodeType.FOLDER:
                 option["attrs"]["data-node_type"] = "folder"
+                option["attrs"]["data-node_id"] = dicom_node.id
 
         return option
+

adit/settings/base.py

@@ -13,6 +13,7 @@
 from pathlib import Path
 from typing import Literal
 
+from django.core.exceptions import ImproperlyConfigured
 from environs import env
 from pydicom import config as pydicom_config
 
@@ -80,6 +81,7 @@
     "adit.selective_transfer.apps.SelectiveTransferConfig",
     "adit.batch_query.apps.BatchQueryConfig",
     "adit.batch_transfer.apps.BatchTransferConfig",
+    "adit.upload.apps.UploadConfig",
     "adit.dicom_explorer.apps.DicomExplorerConfig",
     "adit.dicom_web.apps.DicomWebConfig",
     "channels",
@@ -452,3 +454,8 @@
     "StudyDate",
     "StudyTime",
 ]
+
+# Secret seed for Patient data anonymization
+ANONYMIZATION_SEED = env.str("ANONYMIZATION_SEED", default="")
+if not ANONYMIZATION_SEED:
+    raise ImproperlyConfigured("ANONYMIZATION_SEED must be set")

adit/upload/admin.py

@@ -0,0 +1,6 @@
+from django.contrib import admin
+
+# Register your models here.
+from .models import UploadSettings
+
+admin.site.register(UploadSettings, admin.ModelAdmin)

adit/upload/apps.py

@@ -0,0 +1,29 @@
+from django.apps import AppConfig
+
+SECTION_NAME = "DICOM Upload"
+
+
+class UploadConfig(AppConfig):
+    default_auto_field = "django.db.models.BigAutoField"
+    name = "adit.upload"
+
+    def ready(self):
+        register_app()
+
+
+def register_app():
+    from adit_radis_shared.common.site import MainMenuItem, register_main_menu_item
+
+    register_main_menu_item(
+        MainMenuItem(
+            url_name="upload_create",
+            label=SECTION_NAME,
+        )
+    )
+
+
+def create_app_settings():
+    from .models import UploadSettings
+
+    if not UploadSettings.objects.exists():
+        UploadSettings.objects.create()

adit/upload/forms.py

@@ -0,0 +1,90 @@
+from crispy_forms.helper import FormHelper
+from crispy_forms.layout import Column, Div, Field, Layout, Row
+from django import forms
+
+from adit.core.fields import DicomNodeChoiceField
+from adit.core.validators import no_backslash_char_validator, no_control_chars_validator
+
+
+class MultipleFileInput(forms.widgets.FileInput):
+    def __init__(self, attrs=None):
+        attrs = attrs or {}
+        attrs["onchange"] = "chooseFolder(event)"
+        attrs["webkitdirectory"] = True
+        attrs["directory"] = True
+        attrs["multiple"] = True
+        super().__init__(attrs)
+
+
+class UploadForm(forms.Form):
+    pseudonym = forms.CharField(
+        required=True,
+        max_length=64,
+        validators=[no_backslash_char_validator, no_control_chars_validator],
+        label="Patient Pseudonym",
+    )
+
+    def __init__(self, *args, **kwargs):
+        self.user = kwargs.pop("user")
+        self.action = kwargs.pop("action")
+
+        super().__init__(*args, **kwargs)
+
+        self.fields["destination"] = DicomNodeChoiceField("destination", self.user)
+        self.fields["pseudonym"].required = True
+        self.fields["destination"].required = True
+        self.helper = FormHelper(self)
+        form_fields_layout = self.build_query_form_layout()
+
+        # We swap the form using the htmx alpine-morph extension to retain the focus on the input
+        self.helper.layout = Layout(
+            Div(
+                form_fields_layout,
+                css_id="form_fields",
+            ),
+        )
+        self.helper.form_action = ""
+        self.helper.attrs = {
+            "x-init": "initUploadForm($el)",
+            "id": "myForm",
+            "hx-ext": "alpine-morph",
+            "hx-post": "",
+            "method": "post",
+            "hx-trigger": "submit",
+            "hx-swap-oob": "true",
+            "action": "",
+            "novalidate": "",
+            "enctype": "multipart/form-data",
+        }
+
+    def build_query_form_layout(self):
+        query_form_layout = Layout(
+            Div(
+                Row(
+                    Column(
+                        self.build_option_field(
+                            "pseudonym",
+                        )
+                    ),
+                    Column(
+                        Field(
+                            "destination",
+                            **{
+                                "x-init": "initDestination($el)",
+                                "@change": "onDestinationChange($event)",
+                            },
+                        )
+                    ),
+                ),
+                css_id="form_partial",
+            )
+        )
+
+        return query_form_layout
+
+    def build_option_field(self, field_name, additional_attrs=None):
+        attrs = {"@keydown.enter.prevent": ""}
+        if additional_attrs:
+            attrs = {**additional_attrs, **attrs}
+
+        return Column(Field(field_name, **attrs))

adit/upload/migrations/0001_initial.py

@@ -0,0 +1,27 @@
+# Generated by Django 5.1 on 2024-10-19 16:55
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='UploadSettings',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('locked', models.BooleanField(default=False)),
+                ('suspended', models.BooleanField(default=False)),
+            ],
+            options={
+                'verbose_name_plural': 'Upload settings',
+                'permissions': [('can_upload_data', 'Can upload data')],
+                'default_permissions': (),
+            },
+        ),
+    ]

adit/upload/models.py

@@ -0,0 +1,12 @@
+from adit.core.models import DicomAppSettings
+
+
+class UploadSettings(DicomAppSettings):
+    class Meta:
+        verbose_name_plural = "Upload settings"
+        default_permissions = ()
+        permissions = [
+            ("can_upload_data", "Can upload data"),
+        ]
+
+