From 9f1ff2cdc83b204566ac59ab743b70c761996e88 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Mon, 15 Feb 2021 16:46:05 +0000
Subject: [PATCH] .

---
 .../0019_longseriesimage_upload_filename.py    | 18 ++++++++++++++++++
 longs/models.py                                |  1 +
 longs/templates/longs/longseries_form.html     | 18 +++++++++++-------
 3 files changed, 30 insertions(+), 7 deletions(-)
 create mode 100644 longs/migrations/0019_longseriesimage_upload_filename.py

diff --git a/longs/migrations/0019_longseriesimage_upload_filename.py b/longs/migrations/0019_longseriesimage_upload_filename.py
new file mode 100644
index 00000000..f513f775
--- /dev/null
+++ b/longs/migrations/0019_longseriesimage_upload_filename.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.1.5 on 2021-02-15 16:16
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('longs', '0018_auto_20210215_1052'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='longseriesimage',
+            name='upload_filename',
+            field=models.CharField(blank=True, max_length=255),
+        ),
+    ]
diff --git a/longs/models.py b/longs/models.py
index 79c26665..1b2d62a7 100644
--- a/longs/models.py
+++ b/longs/models.py
@@ -151,6 +151,7 @@ def test_image_validator(file):
 class LongSeriesImage(models.Model):
     image = models.FileField(upload_to=image_directory_path)
     position = models.IntegerField(default=0)
+    upload_filename = models.CharField(max_length=255, blank=True)
     series = models.ForeignKey(
         "LongSeries", related_name="images", on_delete=models.SET_NULL, null=True
     )
diff --git a/longs/templates/longs/longseries_form.html b/longs/templates/longs/longseries_form.html
index 5e640c30..3f08064f 100755
--- a/longs/templates/longs/longseries_form.html
+++ b/longs/templates/longs/longseries_form.html
@@ -193,7 +193,6 @@
                 $(`img[data-input-id='${input.id}'`).removeClass("image-ident-loading");
                 console.log(l);
                 if (l.includes("accesion") || l.includes("number") || l.search(/(ref|rk9|rh8|ra9|rbz)\d+/g) > -1) {
-                    console.log("SHIT", input);
                     $(input).addClass("image-ident-warning");
                     $(`img[data-input-id='${input.id}'`).addClass("image-ident-warning");
                 } else {
@@ -218,13 +217,14 @@
             });
         }
 
-        const readFile = (file) => {
+        const readFile = (file, el) => {
             reader(file).then(reader => {
                 var image = new Image();
                 image.height = 100;
                 image.title = file.name;
                 image.src = reader.result;
-                $("#images").append(image);
+                console.log("read" ,el);
+                $(el).parent().parent().preppend(image);
                 //images.push(reader.result);
                 loadViewer(images);
             });
@@ -239,7 +239,7 @@
             console.log(el);
             if (el.files.length > 0) {
                 filename = el.files[0].name;
-                await readFile(el.files[0]);
+                await readFile(el.files[0], el);
             }
         })
 
@@ -261,7 +261,7 @@
             }
         }
 
-        image_set = $("#images img");
+        image_set = $("#image_form_set img");
         if (n == image_set.length) {
             const event = new CustomEvent('loadDicomViewer', { "detail": images });
 
@@ -282,9 +282,13 @@
             console.log(ul)
 
             file_element = $(ul).find("input[type=file]").get(0);
-            console.log(file_element);
 
-            ""
+            // If a (new) file is being uploaded we save it's name prior to it being hashed
+            if (file_element.files.length > 0) {
+                file_name = file_element.files[0].name
+                $(ul).find("input[type=text]").val(file_name);
+            }
+
             if (file_element.files.length > 0 || $(ul).find(":contains('Currently:')")) {
                 n++;
                 $(ul).find("input[type=number]").val(n);