further improvements

atlas/templates/atlas/user_uploads.html

@@ -1,36 +1,47 @@
 {% extends 'atlas/base.html' %}
 
 {% block content %}
-<h2>Uploaded dicoms</h2>
+    <h2>Uploaded dicoms</h2>
 
-    
-{% if dicoms %}
-    <ul>
-    {% for dicom in dicoms %}
-    <li>
-        {{dicom.image}} {{dicom.get_basic_dicom_tags}}
-    </li>
-    {% endfor %}
-    </ul>
 
-        
-<button
-hx-get="{% url 'api-1:clear_dicoms' %}"
-hx-confirm="This will clear all uploads that have not been imported into series, Continue?"
->Delete Uploads</button>
-<button
-hx-get="{% url 'api-1:import_dicoms' %}"
-hx-target=".imported"
+    {% if series_list %}
+        <ul>
+            {% for series, n, tags in series_list %}
+                <li>
+                    {{series}} [{{n}} images] <br/>
+                    {{tags}}
+                </li>
+            {% endfor %}
+        </ul>
 
->Import</button>
+        {% if case %}
+            <p>Importing into case {{case}}</p>
+        {% endif %}
 
-    <div class="imported">
+        <button
+            hx-get="{% url 'api-1:clear_dicoms' %}"
+            hx-confirm="This will clear all uploads that have not been imported into series, Continue?"
+        >Delete Uploads</button>
+        {% if case %}
+        <button
+            hx-get="{% url 'api-1:import_dicoms_case' case.id %}"
+            hx-target=".imported"
+        >Import</button>
 
-    </div>
+        {% else %}
+        <button
+            hx-get="{% url 'api-1:import_dicoms' %}"
+            hx-target=".imported"
+        >Import</button>
+        {% endif %}
+
+        <div class="imported">
+
+        </div>
     {% else %}
-    No uploads awaiting importing have been found.
-{% endif %}
+        No uploads awaiting importing have been found.
+    {% endif %}
 
-<p><a href="{% url 'atlas:series_view' %}?case=null">View orphan series</a></p>
+    <p><a href="{% url 'atlas:series_view' %}?case=null">View orphan series</a></p>
 
 {% endblock %}