From 626b9d63d755b67a7e81e297d4f0482d53540910 Mon Sep 17 00:00:00 2001
From: David Pollard <pollardld@gmail.com>
Date: Fri, 27 Sep 2024 16:01:43 -0700
Subject: [PATCH 01/16] Add Media Collection Feature to Django Admin

---
 TEKDB/TEKDB/admin.py                          | 18 ++++++++
 TEKDB/TEKDB/forms.py                          | 26 +++++++++++
 .../migrations/0013_auto_20240927_1553.py     | 43 +++++++++++++++++++
 TEKDB/TEKDB/models.py                         | 19 +++++++-
 .../templates/admin/MediaCollectionForm.html  |  5 +++
 TEKDB/TEKDB/views.py                          | 41 +++++++++++++++++-
 ...figuration_preferredinitialismplacement.py | 18 ++++++++
 7 files changed, 168 insertions(+), 2 deletions(-)
 create mode 100644 TEKDB/TEKDB/forms.py
 create mode 100644 TEKDB/TEKDB/migrations/0013_auto_20240927_1553.py
 create mode 100644 TEKDB/TEKDB/templates/admin/MediaCollectionForm.html
 create mode 100644 TEKDB/configuration/migrations/0010_alter_configuration_preferredinitialismplacement.py

diff --git a/TEKDB/TEKDB/admin.py b/TEKDB/TEKDB/admin.py
index 41b7a5b3..542e28b7 100644
--- a/TEKDB/TEKDB/admin.py
+++ b/TEKDB/TEKDB/admin.py
@@ -440,6 +440,24 @@ class CitationsAdmin(RecordAdminProxy, RecordModelAdmin):
     )
     form = CitationsForm
 
+#   * Media COllection Admin
+from .models import MediaCollection
+from .forms import MediaCollectionForm
+
+class MediaCollectionAdmin(admin.ModelAdmin):
+    form = MediaCollectionForm
+
+    def save_model(self, request, obj, form, change):
+        super().save_model(request, obj, form, change)
+        for file in request.FILES.getlist('files'):
+            Media.objects.create(
+                collection=obj,
+                mediafile=file,
+                date=form.cleaned_data['date'],
+            )
+
+admin.site.register(MediaCollection, MediaCollectionAdmin)
+
 class MediaAdmin(RecordAdminProxy, RecordModelAdmin):
     readonly_fields = ('medialink',
     'enteredbyname', 'enteredbytribe','enteredbytitle','enteredbydate',
diff --git a/TEKDB/TEKDB/forms.py b/TEKDB/TEKDB/forms.py
new file mode 100644
index 00000000..1c76956e
--- /dev/null
+++ b/TEKDB/TEKDB/forms.py
@@ -0,0 +1,26 @@
+from django import forms
+from .models import MediaCollection, Media
+
+class MultipleFileInput(forms.ClearableFileInput):
+    allow_multiple_selected = True
+
+class MultipleFileField(forms.FileField):
+    def __init__(self, *args, **kwargs):
+        kwargs.setdefault("widget", MultipleFileInput())
+        super().__init__(*args, **kwargs)
+
+    def clean(self, data, initial=None):
+        single_file_clean = super().clean
+        if isinstance(data, (list, tuple)):
+            result = [single_file_clean(d, initial) for d in data]
+        else:
+            result = [single_file_clean(data, initial)]
+        return result
+
+class MediaCollectionForm(forms.ModelForm):
+    files = MultipleFileField()
+    date = forms.DateField(widget=forms.SelectDateWidget)
+
+    class Meta:
+        model = MediaCollection
+        fields = ['name', 'files', 'date']
\ No newline at end of file
diff --git a/TEKDB/TEKDB/migrations/0013_auto_20240927_1553.py b/TEKDB/TEKDB/migrations/0013_auto_20240927_1553.py
new file mode 100644
index 00000000..05965e14
--- /dev/null
+++ b/TEKDB/TEKDB/migrations/0013_auto_20240927_1553.py
@@ -0,0 +1,43 @@
+# Generated by Django 3.2.25 on 2024-09-27 22:53
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('TEKDB', '0012_auto_20240926_1440'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='MediaCollection',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(blank=True, max_length=255, null=True)),
+                ('created_at', models.DateTimeField(auto_now_add=True, null=True)),
+                ('updated_at', models.DateTimeField(auto_now=True, null=True)),
+            ],
+        ),
+        migrations.AddField(
+            model_name='media',
+            name='created_at',
+            field=models.DateTimeField(auto_now_add=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='media',
+            name='date',
+            field=models.DateField(blank=True, default=None, null=True),
+        ),
+        migrations.AddField(
+            model_name='media',
+            name='updated_at',
+            field=models.DateTimeField(auto_now=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='media',
+            name='collection',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='media_records', to='TEKDB.mediacollection'),
+        ),
+    ]
diff --git a/TEKDB/TEKDB/models.py b/TEKDB/TEKDB/models.py
index 75b729a2..a647d8a2 100644
--- a/TEKDB/TEKDB/models.py
+++ b/TEKDB/TEKDB/models.py
@@ -1830,6 +1830,15 @@ def __unicode__(self):
     def __str__(self):
         return self.username or ''
 
+
+#   * Media Collection
+#   * 
+
+class MediaCollection(models.Model):
+    name = models.CharField(max_length=255, blank=True, null=True)
+    created_at = models.DateTimeField(auto_now_add=True, blank=True, null=True)
+    updated_at = models.DateTimeField(auto_now=True, blank=True, null=True)
+
 class Media(Reviewable, Queryable, Record, ModeratedModel):
     mediaid = models.AutoField(db_column='mediaid', primary_key=True)
     mediatype = models.ForeignKey(LookupMediaType, db_column='mediatype', max_length=255, blank=True, null=True, verbose_name='type', default=None, on_delete=models.SET_DEFAULT)
@@ -1839,6 +1848,14 @@ class Media(Reviewable, Queryable, Record, ModeratedModel):
     mediafile = models.FileField(db_column='mediafile', max_length=255, blank=True, null=True, verbose_name='file')
     limitedaccess = models.BooleanField(db_column='limitedaccess', null=True, default=False, verbose_name='limited access?')
 
+    #   * Media Collection
+    collection = models.ForeignKey(MediaCollection, related_name='media_records', on_delete=models.CASCADE, blank=True, null=True)
+    date = models.DateField(blank=True, null=True, default=None)
+    created_at = models.DateTimeField(auto_now_add=True, blank=True, null=True)
+    updated_at = models.DateTimeField(auto_now=True, blank=True, null=True)
+
+
+
     class Meta:
         managed = MANAGED
         db_table = 'media'
@@ -2880,4 +2897,4 @@ def save(self, *args, **kwargs):
             self.is_superuser = True
         else:
             self.is_superuser = False
-        super(Users, self).save(*args, **kwargs)
+        super(Users, self).save(*args, **kwargs)
\ No newline at end of file
diff --git a/TEKDB/TEKDB/templates/admin/MediaCollectionForm.html b/TEKDB/TEKDB/templates/admin/MediaCollectionForm.html
new file mode 100644
index 00000000..6f3dc194
--- /dev/null
+++ b/TEKDB/TEKDB/templates/admin/MediaCollectionForm.html
@@ -0,0 +1,5 @@
+<form method="post" enctype="multipart/form-data">
+    {% csrf_token %}
+    {{ form.as_p }}
+    <button type="submit">Upload</button>
+</form>
\ No newline at end of file
diff --git a/TEKDB/TEKDB/views.py b/TEKDB/TEKDB/views.py
index 1b826633..7040cdd4 100644
--- a/TEKDB/TEKDB/views.py
+++ b/TEKDB/TEKDB/views.py
@@ -9,7 +9,7 @@
 from django.db.models import Q
 from django.db.utils import OperationalError
 from django.http import HttpResponse, Http404, FileResponse, JsonResponse
-from django.shortcuts import render
+from django.shortcuts import render, redirect
 import io
 import os
 import shutil
@@ -344,3 +344,42 @@ def get_queryset(self):
             )
 
         return qs.order_by(Lower('activityshortdescription__activity'), Lower('placeresourceid__placeid__indigenousplacename'), Lower('placeresourceid__resourceid__commonname'))
+
+
+from django.views import View
+from .models import MediaCollection, Media
+from .forms import MediaCollectionForm
+
+# class FileFieldFormView(FormView):
+#     form_class = MediaCollectionForm
+#     template_name = "admin/MediaCollectionForm.html"  # Replace with your template.
+#     success_url = reverse()  # Replace with your URL or reverse().
+
+#     def form_valid(self, form):
+#         media_collection = form.save()
+#         for file in request.FILES.getlist('files'):
+#             Media.objects.create(
+#                 collection=media_collection,
+#                 file=file,
+#                 date=form.cleaned_data['date'],
+#                 location=form.cleaned_data['location'],
+#                 species=form.cleaned_data['species']
+#             )
+#         return super().form_valid(form)
+
+class MediaCollectionCreateView(View):
+    def get(self, request):
+        form = MediaCollectionForm()
+        return render(request, 'admin/MediaCollectionForm.html', {'form': form})
+
+    def post(self, request):
+        form = MediaCollectionForm(request.POST, request.FILES)
+        if form.is_valid():
+            media_collection = form.save()
+            for file in request.FILES.getlist('files'):
+                Media.objects.create(
+                    collection=media_collection,
+                    file=file,
+                )
+            return redirect('media_collection_list')
+        return render(request, 'admin/MediaCollectionForm.html', {'form': form})
\ No newline at end of file
diff --git a/TEKDB/configuration/migrations/0010_alter_configuration_preferredinitialismplacement.py b/TEKDB/configuration/migrations/0010_alter_configuration_preferredinitialismplacement.py
new file mode 100644
index 00000000..f3b087c8
--- /dev/null
+++ b/TEKDB/configuration/migrations/0010_alter_configuration_preferredinitialismplacement.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.25 on 2024-09-27 22:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('configuration', '0009_configuration_preferredinitialismplacement'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='configuration',
+            name='preferredInitialismPlacement',
+            field=models.CharField(choices=[('default', 'Default'), ('before', 'Before'), ('after', 'After')], default=('default', 'Default'), help_text='Select the position of the preferred initialism in relative to the logo.', max_length=255),
+        ),
+    ]

From 689ee9bdd7b1634fc9c1907cafe6ee3c1fb9cd8e Mon Sep 17 00:00:00 2001
From: David Pollard <pollardld@gmail.com>
Date: Tue, 1 Oct 2024 15:35:30 -0700
Subject: [PATCH 02/16] Use correct name for media collection

---
 TEKDB/TEKDB/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TEKDB/TEKDB/models.py b/TEKDB/TEKDB/models.py
index a647d8a2..bbc9de90 100644
--- a/TEKDB/TEKDB/models.py
+++ b/TEKDB/TEKDB/models.py
@@ -1849,7 +1849,7 @@ class Media(Reviewable, Queryable, Record, ModeratedModel):
     limitedaccess = models.BooleanField(db_column='limitedaccess', null=True, default=False, verbose_name='limited access?')
 
     #   * Media Collection
-    collection = models.ForeignKey(MediaCollection, related_name='media_records', on_delete=models.CASCADE, blank=True, null=True)
+    collection = models.ForeignKey(MediaCollection, related_name='media_collection', on_delete=models.CASCADE, blank=True, null=True)
     date = models.DateField(blank=True, null=True, default=None)
     created_at = models.DateTimeField(auto_now_add=True, blank=True, null=True)
     updated_at = models.DateTimeField(auto_now=True, blank=True, null=True)

From ac7b6f90e6d011f96b4f73ae7a401f51fd477a00 Mon Sep 17 00:00:00 2001
From: David Pollard <pollardld@gmail.com>
Date: Fri, 4 Oct 2024 13:20:00 -0700
Subject: [PATCH 03/16] Changing Media Collection to Media Bulk Upload. Add
 additional fields from media

---
 TEKDB/TEKDB/admin.py  | 10 ++++----
 TEKDB/TEKDB/forms.py  |  6 ++---
 TEKDB/TEKDB/models.py | 56 +++++++++++++++++++++++++++++++++++++++++--
 TEKDB/TEKDB/views.py  | 18 +++++++-------
 4 files changed, 71 insertions(+), 19 deletions(-)

diff --git a/TEKDB/TEKDB/admin.py b/TEKDB/TEKDB/admin.py
index 542e28b7..5f850f7f 100644
--- a/TEKDB/TEKDB/admin.py
+++ b/TEKDB/TEKDB/admin.py
@@ -441,11 +441,11 @@ class CitationsAdmin(RecordAdminProxy, RecordModelAdmin):
     form = CitationsForm
 
 #   * Media COllection Admin
-from .models import MediaCollection
-from .forms import MediaCollectionForm
+from .models import MediaBulkUpload
+from .forms import MediaBulkUploadForm
 
-class MediaCollectionAdmin(admin.ModelAdmin):
-    form = MediaCollectionForm
+class MediaBulkUploadAdmin(admin.ModelAdmin):
+    form = MediaBulkUploadForm
 
     def save_model(self, request, obj, form, change):
         super().save_model(request, obj, form, change)
@@ -456,7 +456,7 @@ def save_model(self, request, obj, form, change):
                 date=form.cleaned_data['date'],
             )
 
-admin.site.register(MediaCollection, MediaCollectionAdmin)
+admin.site.register(MediaBulkUpload, MediaBulkUploadAdmin)
 
 class MediaAdmin(RecordAdminProxy, RecordModelAdmin):
     readonly_fields = ('medialink',
diff --git a/TEKDB/TEKDB/forms.py b/TEKDB/TEKDB/forms.py
index 1c76956e..81d94576 100644
--- a/TEKDB/TEKDB/forms.py
+++ b/TEKDB/TEKDB/forms.py
@@ -1,5 +1,5 @@
 from django import forms
-from .models import MediaCollection, Media
+from .models import MediaBulkUpload, Media
 
 class MultipleFileInput(forms.ClearableFileInput):
     allow_multiple_selected = True
@@ -17,10 +17,10 @@ def clean(self, data, initial=None):
             result = [single_file_clean(data, initial)]
         return result
 
-class MediaCollectionForm(forms.ModelForm):
+class MediaBulkUploadForm(forms.ModelForm):
     files = MultipleFileField()
     date = forms.DateField(widget=forms.SelectDateWidget)
 
     class Meta:
-        model = MediaCollection
+        model = MediaBulkUpload
         fields = ['name', 'files', 'date']
\ No newline at end of file
diff --git a/TEKDB/TEKDB/models.py b/TEKDB/TEKDB/models.py
index bbc9de90..3952b0cc 100644
--- a/TEKDB/TEKDB/models.py
+++ b/TEKDB/TEKDB/models.py
@@ -1834,10 +1834,62 @@ def __str__(self):
 #   * Media Collection
 #   * 
 
-class MediaCollection(models.Model):
+# Through tables or one to many relationship, reference Anna's work on MidA
+#   * PlacesMediaEvents
+#   * ResourcesMediaEvents
+#   * MediaCitationEvents
+#   * ResourceActivityMediaEvents
+#   * PlacesResourceMediaEvents
+
+# Change name to reflect that this is a bulk media upload event
+# Sorting 
+class MediaBulkUpload(models.Model):
     name = models.CharField(max_length=255, blank=True, null=True)
+    description = models.TextField(blank=True, null=True)
     created_at = models.DateTimeField(auto_now_add=True, blank=True, null=True)
     updated_at = models.DateTimeField(auto_now=True, blank=True, null=True)
+    user = models.ForeignKey(LookupUserInfo, db_column='user', blank=True, null=True, verbose_name='user', default=None, on_delete=models.SET_DEFAULT)
+    media = models.ManyToManyField('Media', related_name='media', blank=True, null=True)
+    
+    # @property
+    # def count(self):
+        # number of media items uploaded
+
+    # Suggested Additions
+    # Multi upload
+    # Visual displayed of uploads
+        # Example in blue pages
+        # Gallery of Media 
+        # Ability to edit Media
+
+    # Media Fields + Relationships
+    # mediatype = models.ForeignKey(LookupMediaType, db_column='mediatype', max_length=255, blank=True, null=True, verbose_name='type', default=None, on_delete=models.SET_DEFAULT)
+    # medianame = models.CharField(db_column='medianame', max_length=255, blank=True, null=True, verbose_name='name')
+    # mediadescription = RichTextField(db_column='mediadescription', blank=True, null=True, verbose_name='description', config_name="custom") #CKEditor Rich Text Editor Field
+    # medialink = models.CharField(db_column='medialink', max_length=255, blank=True, null=True, verbose_name='historic location')
+    # mediafile = models.FileField(db_column='mediafile', max_length=255, blank=True, null=True, verbose_name='file')
+    
+    # PlaceMedia relationship
+    # other 5 relationships ...
+    # def relationships(self):
+    # relationship_list = []
+    # places = [x.get_relationship_json(type(self)) for x in self.placesmediaevents_set.all()]
+    # if len(places) > 0:
+    #     relationship_list.append({'key': 'Places', 'value': places})
+    # resources = [x.get_relationship_json(type(self)) for x in self.resourcesmediaevents_set.all()]
+    # if len(resources) > 0:
+    #     relationship_list.append({'key': 'Resources', 'value': resources})
+    # citations = [x.get_relationship_json(type(self)) for x in self.mediacitationevents_set.all()]
+    # if len(citations) > 0:
+    #     relationship_list.append({'key': 'Bibliographic Sources', 'value': citations})
+    # activities = [x.get_relationship_json(type(self)) for x in self.resourceactivitymediaevents_set.all()]
+    # if len(activities) > 0:
+    #     relationship_list.append({'key': 'Activities', 'value': activities})
+    # placeresources = [x.get_relationship_json(type(self)) for x in self.placesresourcemediaevents_set.all()]
+    # if len(placeresources) > 0:
+    #     relationship_list.append({'key': 'Place-Resources', 'value': placeresources})
+    # return relationship_list
+
 
 class Media(Reviewable, Queryable, Record, ModeratedModel):
     mediaid = models.AutoField(db_column='mediaid', primary_key=True)
@@ -1849,7 +1901,7 @@ class Media(Reviewable, Queryable, Record, ModeratedModel):
     limitedaccess = models.BooleanField(db_column='limitedaccess', null=True, default=False, verbose_name='limited access?')
 
     #   * Media Collection
-    collection = models.ForeignKey(MediaCollection, related_name='media_collection', on_delete=models.CASCADE, blank=True, null=True)
+    media_collection = models.ManyToManyField(MediaBulkUpload, related_name='media_collection', blank=True, null=True)
     date = models.DateField(blank=True, null=True, default=None)
     created_at = models.DateTimeField(auto_now_add=True, blank=True, null=True)
     updated_at = models.DateTimeField(auto_now=True, blank=True, null=True)
diff --git a/TEKDB/TEKDB/views.py b/TEKDB/TEKDB/views.py
index 7040cdd4..a3d239c2 100644
--- a/TEKDB/TEKDB/views.py
+++ b/TEKDB/TEKDB/views.py
@@ -347,12 +347,12 @@ def get_queryset(self):
 
 
 from django.views import View
-from .models import MediaCollection, Media
-from .forms import MediaCollectionForm
+from .models import MediaBulkUpload, Media
+from .forms import MediaBulkUploadForm
 
 # class FileFieldFormView(FormView):
-#     form_class = MediaCollectionForm
-#     template_name = "admin/MediaCollectionForm.html"  # Replace with your template.
+#     form_class = MediaBulkUploadForm
+#     template_name = "admin/MediaBulkUploadForm.html"  # Replace with your template.
 #     success_url = reverse()  # Replace with your URL or reverse().
 
 #     def form_valid(self, form):
@@ -367,13 +367,13 @@ def get_queryset(self):
 #             )
 #         return super().form_valid(form)
 
-class MediaCollectionCreateView(View):
+class MediaBulkUploadCreateView(View):
     def get(self, request):
-        form = MediaCollectionForm()
-        return render(request, 'admin/MediaCollectionForm.html', {'form': form})
+        form = MediaBulkUploadForm()
+        return render(request, 'admin/MediaBulkUploadForm.html', {'form': form})
 
     def post(self, request):
-        form = MediaCollectionForm(request.POST, request.FILES)
+        form = MediaBulkUploadForm(request.POST, request.FILES)
         if form.is_valid():
             media_collection = form.save()
             for file in request.FILES.getlist('files'):
@@ -382,4 +382,4 @@ def post(self, request):
                     file=file,
                 )
             return redirect('media_collection_list')
-        return render(request, 'admin/MediaCollectionForm.html', {'form': form})
\ No newline at end of file
+        return render(request, 'admin/MediaBulkUploadForm.html', {'form': form})
\ No newline at end of file

From a8a165a89e29ae54e26b4e02553f508e2f79c42a Mon Sep 17 00:00:00 2001
From: David Pollard <pollardld@gmail.com>
Date: Fri, 4 Oct 2024 13:20:23 -0700
Subject: [PATCH 04/16]  Add migration for previous commit

---
 .../migrations/0014_auto_20241004_1319.py     | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 TEKDB/TEKDB/migrations/0014_auto_20241004_1319.py

diff --git a/TEKDB/TEKDB/migrations/0014_auto_20241004_1319.py b/TEKDB/TEKDB/migrations/0014_auto_20241004_1319.py
new file mode 100644
index 00000000..9d0eb134
--- /dev/null
+++ b/TEKDB/TEKDB/migrations/0014_auto_20241004_1319.py
@@ -0,0 +1,47 @@
+# Generated by Django 3.2.25 on 2024-10-04 20:19
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('Lookup', '0005_alter_lookupuserinfo_id'),
+        ('TEKDB', '0013_auto_20240927_1553'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='MediaBulkUpload',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(blank=True, max_length=255, null=True)),
+                ('description', models.TextField(blank=True, null=True)),
+                ('created_at', models.DateTimeField(auto_now_add=True, null=True)),
+                ('updated_at', models.DateTimeField(auto_now=True, null=True)),
+            ],
+        ),
+        migrations.RemoveField(
+            model_name='media',
+            name='collection',
+        ),
+        migrations.DeleteModel(
+            name='MediaCollection',
+        ),
+        migrations.AddField(
+            model_name='mediabulkupload',
+            name='media',
+            field=models.ManyToManyField(blank=True, null=True, related_name='media', to='TEKDB.Media'),
+        ),
+        migrations.AddField(
+            model_name='mediabulkupload',
+            name='user',
+            field=models.ForeignKey(blank=True, db_column='user', default=None, null=True, on_delete=django.db.models.deletion.SET_DEFAULT, to='Lookup.lookupuserinfo', verbose_name='user'),
+        ),
+        migrations.AddField(
+            model_name='media',
+            name='media_collection',
+            field=models.ManyToManyField(blank=True, null=True, related_name='media_collection', to='TEKDB.MediaBulkUpload'),
+        ),
+    ]

From 94790ca2aa86311b1ea53991a5d5aec1957d37e1 Mon Sep 17 00:00:00 2001
From: David Pollard <pollardld@gmail.com>
Date: Fri, 4 Oct 2024 15:59:35 -0700
Subject: [PATCH 05/16] Multiple Media uploads with ForeignKey to
 mediabulkupload

---
 TEKDB/TEKDB/admin.py                          | 19 ++++++--
 TEKDB/TEKDB/forms.py                          |  6 ++-
 ...927_1553.py => 0013_auto_20241004_1547.py} | 27 ++++-------
 .../0014_alter_media_mediauploadevent.py      | 19 ++++++++
 .../migrations/0014_auto_20241004_1319.py     | 47 -------------------
 TEKDB/TEKDB/models.py                         | 12 ++---
 .../widgets/thumbnail_file_input.html         |  6 +++
 TEKDB/TEKDB/views.py                          | 39 ---------------
 TEKDB/TEKDB/widgets.py                        | 14 +++++-
 9 files changed, 70 insertions(+), 119 deletions(-)
 rename TEKDB/TEKDB/migrations/{0013_auto_20240927_1553.py => 0013_auto_20241004_1547.py} (52%)
 create mode 100644 TEKDB/TEKDB/migrations/0014_alter_media_mediauploadevent.py
 delete mode 100644 TEKDB/TEKDB/migrations/0014_auto_20241004_1319.py
 create mode 100644 TEKDB/TEKDB/templates/widgets/thumbnail_file_input.html

diff --git a/TEKDB/TEKDB/admin.py b/TEKDB/TEKDB/admin.py
index 5f850f7f..0f9d471d 100644
--- a/TEKDB/TEKDB/admin.py
+++ b/TEKDB/TEKDB/admin.py
@@ -450,11 +450,22 @@ class MediaBulkUploadAdmin(admin.ModelAdmin):
     def save_model(self, request, obj, form, change):
         super().save_model(request, obj, form, change)
         for file in request.FILES.getlist('files'):
-            Media.objects.create(
-                collection=obj,
+            media_instance = Media(
                 mediafile=file,
-                date=form.cleaned_data['date'],
             )
+            media_instance.save()
+            obj.mediabulkupload.set([media_instance])
+
+    def thumbnail_gallery(self, obj):
+        thumbnails = [
+            format_html('<img src="{}" width="100" height="100" />', media.mediafile.url)
+            for media in obj.mediabulkupload.all()
+        ]
+        return format_html(''.join(thumbnails))
+
+    thumbnail_gallery.short_description = 'Thumbnails'
+
+    readonly_fields = ('thumbnail_gallery',)
 
 admin.site.register(MediaBulkUpload, MediaBulkUploadAdmin)
 
@@ -466,7 +477,7 @@ class MediaAdmin(RecordAdminProxy, RecordModelAdmin):
     'enteredbyname','enteredbydate')
     fieldsets = (
         (None, {
-            'fields': (('medianame','mediatype','limitedaccess'),'mediafile','medialink','mediadescription',)
+            'fields': (('medianame','mediatype','limitedaccess'),'mediafile','medialink','mediadescription','media_collection',)
         }),
         ('Review', {
             'fields': (
diff --git a/TEKDB/TEKDB/forms.py b/TEKDB/TEKDB/forms.py
index 81d94576..015c31a6 100644
--- a/TEKDB/TEKDB/forms.py
+++ b/TEKDB/TEKDB/forms.py
@@ -1,5 +1,6 @@
 from django import forms
 from .models import MediaBulkUpload, Media
+from .widgets import ThumbnailFileInput
 
 class MultipleFileInput(forms.ClearableFileInput):
     allow_multiple_selected = True
@@ -17,10 +18,13 @@ def clean(self, data, initial=None):
             result = [single_file_clean(data, initial)]
         return result
 
+# class MultipleFileField(forms.FileField):
+#     widget = ThumbnailFileInput
+
 class MediaBulkUploadForm(forms.ModelForm):
     files = MultipleFileField()
     date = forms.DateField(widget=forms.SelectDateWidget)
 
     class Meta:
         model = MediaBulkUpload
-        fields = ['name', 'files', 'date']
\ No newline at end of file
+        fields = ['name', 'description', 'files', 'date']
\ No newline at end of file
diff --git a/TEKDB/TEKDB/migrations/0013_auto_20240927_1553.py b/TEKDB/TEKDB/migrations/0013_auto_20241004_1547.py
similarity index 52%
rename from TEKDB/TEKDB/migrations/0013_auto_20240927_1553.py
rename to TEKDB/TEKDB/migrations/0013_auto_20241004_1547.py
index 05965e14..750cb883 100644
--- a/TEKDB/TEKDB/migrations/0013_auto_20240927_1553.py
+++ b/TEKDB/TEKDB/migrations/0013_auto_20241004_1547.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.2.25 on 2024-09-27 22:53
+# Generated by Django 3.2.25 on 2024-10-04 22:47
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -7,37 +7,26 @@
 class Migration(migrations.Migration):
 
     dependencies = [
+        ('Lookup', '0005_alter_lookupuserinfo_id'),
         ('TEKDB', '0012_auto_20240926_1440'),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='MediaCollection',
+            name='MediaBulkUpload',
             fields=[
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('name', models.CharField(blank=True, max_length=255, null=True)),
+                ('description', models.TextField(blank=True, null=True)),
+                ('date', models.DateField(blank=True, default=None, null=True)),
                 ('created_at', models.DateTimeField(auto_now_add=True, null=True)),
                 ('updated_at', models.DateTimeField(auto_now=True, null=True)),
+                ('user', models.ForeignKey(blank=True, db_column='user', default=None, null=True, on_delete=django.db.models.deletion.SET_DEFAULT, to='Lookup.lookupuserinfo', verbose_name='user')),
             ],
         ),
         migrations.AddField(
             model_name='media',
-            name='created_at',
-            field=models.DateTimeField(auto_now_add=True, null=True),
-        ),
-        migrations.AddField(
-            model_name='media',
-            name='date',
-            field=models.DateField(blank=True, default=None, null=True),
-        ),
-        migrations.AddField(
-            model_name='media',
-            name='updated_at',
-            field=models.DateTimeField(auto_now=True, null=True),
-        ),
-        migrations.AddField(
-            model_name='media',
-            name='collection',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='media_records', to='TEKDB.mediacollection'),
+            name='mediauploadevent',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='mediabulkupload', to='TEKDB.mediabulkupload'),
         ),
     ]
diff --git a/TEKDB/TEKDB/migrations/0014_alter_media_mediauploadevent.py b/TEKDB/TEKDB/migrations/0014_alter_media_mediauploadevent.py
new file mode 100644
index 00000000..0b511fb9
--- /dev/null
+++ b/TEKDB/TEKDB/migrations/0014_alter_media_mediauploadevent.py
@@ -0,0 +1,19 @@
+# Generated by Django 3.2.25 on 2024-10-04 22:55
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('TEKDB', '0013_auto_20241004_1547'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='media',
+            name='mediauploadevent',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='mediauploadevent', to='TEKDB.mediabulkupload'),
+        ),
+    ]
diff --git a/TEKDB/TEKDB/migrations/0014_auto_20241004_1319.py b/TEKDB/TEKDB/migrations/0014_auto_20241004_1319.py
deleted file mode 100644
index 9d0eb134..00000000
--- a/TEKDB/TEKDB/migrations/0014_auto_20241004_1319.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# Generated by Django 3.2.25 on 2024-10-04 20:19
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('Lookup', '0005_alter_lookupuserinfo_id'),
-        ('TEKDB', '0013_auto_20240927_1553'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='MediaBulkUpload',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(blank=True, max_length=255, null=True)),
-                ('description', models.TextField(blank=True, null=True)),
-                ('created_at', models.DateTimeField(auto_now_add=True, null=True)),
-                ('updated_at', models.DateTimeField(auto_now=True, null=True)),
-            ],
-        ),
-        migrations.RemoveField(
-            model_name='media',
-            name='collection',
-        ),
-        migrations.DeleteModel(
-            name='MediaCollection',
-        ),
-        migrations.AddField(
-            model_name='mediabulkupload',
-            name='media',
-            field=models.ManyToManyField(blank=True, null=True, related_name='media', to='TEKDB.Media'),
-        ),
-        migrations.AddField(
-            model_name='mediabulkupload',
-            name='user',
-            field=models.ForeignKey(blank=True, db_column='user', default=None, null=True, on_delete=django.db.models.deletion.SET_DEFAULT, to='Lookup.lookupuserinfo', verbose_name='user'),
-        ),
-        migrations.AddField(
-            model_name='media',
-            name='media_collection',
-            field=models.ManyToManyField(blank=True, null=True, related_name='media_collection', to='TEKDB.MediaBulkUpload'),
-        ),
-    ]
diff --git a/TEKDB/TEKDB/models.py b/TEKDB/TEKDB/models.py
index 3952b0cc..1520bb16 100644
--- a/TEKDB/TEKDB/models.py
+++ b/TEKDB/TEKDB/models.py
@@ -1846,10 +1846,10 @@ def __str__(self):
 class MediaBulkUpload(models.Model):
     name = models.CharField(max_length=255, blank=True, null=True)
     description = models.TextField(blank=True, null=True)
+    date = models.DateField(blank=True, null=True, default=None)
     created_at = models.DateTimeField(auto_now_add=True, blank=True, null=True)
     updated_at = models.DateTimeField(auto_now=True, blank=True, null=True)
     user = models.ForeignKey(LookupUserInfo, db_column='user', blank=True, null=True, verbose_name='user', default=None, on_delete=models.SET_DEFAULT)
-    media = models.ManyToManyField('Media', related_name='media', blank=True, null=True)
     
     # @property
     # def count(self):
@@ -1900,13 +1900,9 @@ class Media(Reviewable, Queryable, Record, ModeratedModel):
     mediafile = models.FileField(db_column='mediafile', max_length=255, blank=True, null=True, verbose_name='file')
     limitedaccess = models.BooleanField(db_column='limitedaccess', null=True, default=False, verbose_name='limited access?')
 
-    #   * Media Collection
-    media_collection = models.ManyToManyField(MediaBulkUpload, related_name='media_collection', blank=True, null=True)
-    date = models.DateField(blank=True, null=True, default=None)
-    created_at = models.DateTimeField(auto_now_add=True, blank=True, null=True)
-    updated_at = models.DateTimeField(auto_now=True, blank=True, null=True)
-
-
+    #   * Media Bulk Upload Event
+    mediabulkupload = models.ForeignKey(MediaBulkUpload, related_name='mediabulkupload', blank=True, null=True, on_delete=models.SET_NULL)
+    # media_collection = models.ForeignKey(MediaBulkUpload, related_name='mediauploadevent', blank=True, null=True, on_delete=models.SET_NULL)
 
     class Meta:
         managed = MANAGED
diff --git a/TEKDB/TEKDB/templates/widgets/thumbnail_file_input.html b/TEKDB/TEKDB/templates/widgets/thumbnail_file_input.html
new file mode 100644
index 00000000..04ba4993
--- /dev/null
+++ b/TEKDB/TEKDB/templates/widgets/thumbnail_file_input.html
@@ -0,0 +1,6 @@
+{% if widget.value %}
+    <div class="thumbnail">
+        {{ widget.value }}
+    </div>
+{% endif %}
+<input type="file" multiple name="{{ widget.name }}" {% include "django/forms/widgets/attrs.html" %}>
\ No newline at end of file
diff --git a/TEKDB/TEKDB/views.py b/TEKDB/TEKDB/views.py
index a3d239c2..260251d7 100644
--- a/TEKDB/TEKDB/views.py
+++ b/TEKDB/TEKDB/views.py
@@ -344,42 +344,3 @@ def get_queryset(self):
             )
 
         return qs.order_by(Lower('activityshortdescription__activity'), Lower('placeresourceid__placeid__indigenousplacename'), Lower('placeresourceid__resourceid__commonname'))
-
-
-from django.views import View
-from .models import MediaBulkUpload, Media
-from .forms import MediaBulkUploadForm
-
-# class FileFieldFormView(FormView):
-#     form_class = MediaBulkUploadForm
-#     template_name = "admin/MediaBulkUploadForm.html"  # Replace with your template.
-#     success_url = reverse()  # Replace with your URL or reverse().
-
-#     def form_valid(self, form):
-#         media_collection = form.save()
-#         for file in request.FILES.getlist('files'):
-#             Media.objects.create(
-#                 collection=media_collection,
-#                 file=file,
-#                 date=form.cleaned_data['date'],
-#                 location=form.cleaned_data['location'],
-#                 species=form.cleaned_data['species']
-#             )
-#         return super().form_valid(form)
-
-class MediaBulkUploadCreateView(View):
-    def get(self, request):
-        form = MediaBulkUploadForm()
-        return render(request, 'admin/MediaBulkUploadForm.html', {'form': form})
-
-    def post(self, request):
-        form = MediaBulkUploadForm(request.POST, request.FILES)
-        if form.is_valid():
-            media_collection = form.save()
-            for file in request.FILES.getlist('files'):
-                Media.objects.create(
-                    collection=media_collection,
-                    file=file,
-                )
-            return redirect('media_collection_list')
-        return render(request, 'admin/MediaBulkUploadForm.html', {'form': form})
\ No newline at end of file
diff --git a/TEKDB/TEKDB/widgets.py b/TEKDB/TEKDB/widgets.py
index a2a2d81a..b1ba4568 100644
--- a/TEKDB/TEKDB/widgets.py
+++ b/TEKDB/TEKDB/widgets.py
@@ -59,4 +59,16 @@ class Media:
         js = (
             'assets/openlayers6/ol.js',
             'gis/js/OL6MapPolygonWidget.js',
-        )
\ No newline at end of file
+        )
+
+
+from django.forms.widgets import ClearableFileInput
+from django.utils.safestring import mark_safe
+
+class ThumbnailFileInput(ClearableFileInput):
+    template_name = 'widgets/thumbnail_file_input.html'
+
+    def format_value(self, value):
+        if value and hasattr(value, 'url'):
+            return mark_safe(f'<img src="{value.url}" width="100" height="100" />')
+        return super().format_value(value)
\ No newline at end of file

From 36e6b0b5a629eb209f29acd5794251a07c038fc4 Mon Sep 17 00:00:00 2001
From: David Pollard <pollardld@gmail.com>
Date: Fri, 4 Oct 2024 15:59:56 -0700
Subject: [PATCH 06/16] Add additional migrations

---
 .../migrations/0015_auto_20241004_1559.py     | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 TEKDB/TEKDB/migrations/0015_auto_20241004_1559.py

diff --git a/TEKDB/TEKDB/migrations/0015_auto_20241004_1559.py b/TEKDB/TEKDB/migrations/0015_auto_20241004_1559.py
new file mode 100644
index 00000000..8ecc5443
--- /dev/null
+++ b/TEKDB/TEKDB/migrations/0015_auto_20241004_1559.py
@@ -0,0 +1,23 @@
+# Generated by Django 3.2.25 on 2024-10-04 22:59
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('TEKDB', '0014_alter_media_mediauploadevent'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='media',
+            name='mediauploadevent',
+        ),
+        migrations.AddField(
+            model_name='media',
+            name='mediabulkupload',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='mediabulkupload', to='TEKDB.mediabulkupload'),
+        ),
+    ]

From f9f4ff692f0d11f1147b15264e0d97d4db022a6c Mon Sep 17 00:00:00 2001
From: David Pollard <pollardld@gmail.com>
Date: Tue, 8 Oct 2024 13:52:12 -0700
Subject: [PATCH 07/16] Added name for media from bulk upload

---
 TEKDB/TEKDB/admin.py  | 14 ++++++++++++--
 TEKDB/TEKDB/models.py |  2 +-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/TEKDB/TEKDB/admin.py b/TEKDB/TEKDB/admin.py
index 0f9d471d..620b1cd9 100644
--- a/TEKDB/TEKDB/admin.py
+++ b/TEKDB/TEKDB/admin.py
@@ -441,7 +441,9 @@ class CitationsAdmin(RecordAdminProxy, RecordModelAdmin):
     form = CitationsForm
 
 #   * Media COllection Admin
-from .models import MediaBulkUpload
+from django.utils.html import format_html
+from django.contrib import admin
+from .models import MediaBulkUpload, Media
 from .forms import MediaBulkUploadForm
 
 class MediaBulkUploadAdmin(admin.ModelAdmin):
@@ -451,10 +453,12 @@ def save_model(self, request, obj, form, change):
         super().save_model(request, obj, form, change)
         for file in request.FILES.getlist('files'):
             media_instance = Media(
+                medianame=obj.name,
+                mediadescription=obj.description,
                 mediafile=file,
             )
             media_instance.save()
-            obj.mediabulkupload.set([media_instance])
+            obj.mediabulkupload.add(media_instance)
 
     def thumbnail_gallery(self, obj):
         thumbnails = [
@@ -467,6 +471,12 @@ def thumbnail_gallery(self, obj):
 
     readonly_fields = ('thumbnail_gallery',)
 
+    fieldsets = (
+        (None, {
+            'fields': ('name', 'description', 'files', 'date', 'thumbnail_gallery')
+        }),
+    )
+
 admin.site.register(MediaBulkUpload, MediaBulkUploadAdmin)
 
 class MediaAdmin(RecordAdminProxy, RecordModelAdmin):
diff --git a/TEKDB/TEKDB/models.py b/TEKDB/TEKDB/models.py
index 1520bb16..907e8a2f 100644
--- a/TEKDB/TEKDB/models.py
+++ b/TEKDB/TEKDB/models.py
@@ -1902,7 +1902,7 @@ class Media(Reviewable, Queryable, Record, ModeratedModel):
 
     #   * Media Bulk Upload Event
     mediabulkupload = models.ForeignKey(MediaBulkUpload, related_name='mediabulkupload', blank=True, null=True, on_delete=models.SET_NULL)
-    # media_collection = models.ForeignKey(MediaBulkUpload, related_name='mediauploadevent', blank=True, null=True, on_delete=models.SET_NULL)
+    media_collection = models.ForeignKey(MediaBulkUpload, related_name='mediauploadevent', blank=True, null=True, on_delete=models.SET_NULL)
 
     class Meta:
         managed = MANAGED

From 802e64d53d588d9b11d75eb70a736251a6389534 Mon Sep 17 00:00:00 2001
From: David Pollard <pollardld@gmail.com>
Date: Tue, 8 Oct 2024 13:54:24 -0700
Subject: [PATCH 08/16] Fix the media_collection

---
 TEKDB/TEKDB/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TEKDB/TEKDB/models.py b/TEKDB/TEKDB/models.py
index 907e8a2f..1520bb16 100644
--- a/TEKDB/TEKDB/models.py
+++ b/TEKDB/TEKDB/models.py
@@ -1902,7 +1902,7 @@ class Media(Reviewable, Queryable, Record, ModeratedModel):
 
     #   * Media Bulk Upload Event
     mediabulkupload = models.ForeignKey(MediaBulkUpload, related_name='mediabulkupload', blank=True, null=True, on_delete=models.SET_NULL)
-    media_collection = models.ForeignKey(MediaBulkUpload, related_name='mediauploadevent', blank=True, null=True, on_delete=models.SET_NULL)
+    # media_collection = models.ForeignKey(MediaBulkUpload, related_name='mediauploadevent', blank=True, null=True, on_delete=models.SET_NULL)
 
     class Meta:
         managed = MANAGED

From 47660216d32c14fec90cdf576819588179eab031 Mon Sep 17 00:00:00 2001
From: David Pollard <pollardld@gmail.com>
Date: Wed, 9 Oct 2024 17:08:04 -0700
Subject: [PATCH 09/16] Finish changing media_collection to mediabulkupload

---
 TEKDB/TEKDB/models.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/TEKDB/TEKDB/models.py b/TEKDB/TEKDB/models.py
index 1520bb16..3c596332 100644
--- a/TEKDB/TEKDB/models.py
+++ b/TEKDB/TEKDB/models.py
@@ -1902,7 +1902,6 @@ class Media(Reviewable, Queryable, Record, ModeratedModel):
 
     #   * Media Bulk Upload Event
     mediabulkupload = models.ForeignKey(MediaBulkUpload, related_name='mediabulkupload', blank=True, null=True, on_delete=models.SET_NULL)
-    # media_collection = models.ForeignKey(MediaBulkUpload, related_name='mediauploadevent', blank=True, null=True, on_delete=models.SET_NULL)
 
     class Meta:
         managed = MANAGED

From 9b991efa85fdc45c5bb26a539aa7ddca79e99527 Mon Sep 17 00:00:00 2001
From: David Pollard <pollardld@gmail.com>
Date: Fri, 11 Oct 2024 10:56:15 -0700
Subject: [PATCH 10/16] Get rid of extra media_collection in admin

---
 TEKDB/TEKDB/admin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TEKDB/TEKDB/admin.py b/TEKDB/TEKDB/admin.py
index 620b1cd9..d655189e 100644
--- a/TEKDB/TEKDB/admin.py
+++ b/TEKDB/TEKDB/admin.py
@@ -487,7 +487,7 @@ class MediaAdmin(RecordAdminProxy, RecordModelAdmin):
     'enteredbyname','enteredbydate')
     fieldsets = (
         (None, {
-            'fields': (('medianame','mediatype','limitedaccess'),'mediafile','medialink','mediadescription','media_collection',)
+            'fields': (('medianame','mediatype','limitedaccess'),'mediafile','medialink','mediadescription',)
         }),
         ('Review', {
             'fields': (

From 54bb6f4b7c84f2114fe45a24ac44da5854430a1a Mon Sep 17 00:00:00 2001
From: David Pollard <pollardld@gmail.com>
Date: Fri, 11 Oct 2024 10:56:29 -0700
Subject: [PATCH 11/16] Remove comments

---
 TEKDB/TEKDB/models.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/TEKDB/TEKDB/models.py b/TEKDB/TEKDB/models.py
index 3c596332..47d4d03f 100644
--- a/TEKDB/TEKDB/models.py
+++ b/TEKDB/TEKDB/models.py
@@ -1841,8 +1841,7 @@ def __str__(self):
 #   * ResourceActivityMediaEvents
 #   * PlacesResourceMediaEvents
 
-# Change name to reflect that this is a bulk media upload event
-# Sorting 
+# add Sorting 
 class MediaBulkUpload(models.Model):
     name = models.CharField(max_length=255, blank=True, null=True)
     description = models.TextField(blank=True, null=True)

From d10493c2653cbe7d4b2948ab6de63ebaa681bed1 Mon Sep 17 00:00:00 2001
From: David Pollard <pollardld@gmail.com>
Date: Fri, 11 Oct 2024 12:56:07 -0700
Subject: [PATCH 12/16] Revise imports in admin

---
 TEKDB/TEKDB/admin.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/TEKDB/TEKDB/admin.py b/TEKDB/TEKDB/admin.py
index d655189e..30236cd6 100644
--- a/TEKDB/TEKDB/admin.py
+++ b/TEKDB/TEKDB/admin.py
@@ -11,6 +11,7 @@
 from ckeditor.widgets import CKEditorWidget
 from reversion.admin import VersionAdmin
 
+from .forms import MediaBulkUploadForm
 from .models import *
 
 from TEKDB.settings import ADMIN_SITE_HEADER
@@ -440,12 +441,8 @@ class CitationsAdmin(RecordAdminProxy, RecordModelAdmin):
     )
     form = CitationsForm
 
-#   * Media COllection Admin
-from django.utils.html import format_html
-from django.contrib import admin
-from .models import MediaBulkUpload, Media
-from .forms import MediaBulkUploadForm
 
+#   * Bulk Media Upload Admin
 class MediaBulkUploadAdmin(admin.ModelAdmin):
     form = MediaBulkUploadForm
 
@@ -479,6 +476,7 @@ def thumbnail_gallery(self, obj):
 
 admin.site.register(MediaBulkUpload, MediaBulkUploadAdmin)
 
+
 class MediaAdmin(RecordAdminProxy, RecordModelAdmin):
     readonly_fields = ('medialink',
     'enteredbyname', 'enteredbytribe','enteredbytitle','enteredbydate',

From d18ecff0c167bd1c53878cbf25b2b3c6b3d24255 Mon Sep 17 00:00:00 2001
From: David Pollard <pollardld@gmail.com>
Date: Fri, 11 Oct 2024 13:14:40 -0700
Subject: [PATCH 13/16] Add relationships for Media when uploading a bulk media

---
 TEKDB/TEKDB/admin.py | 28 +++++++++++++++++++++++++---
 TEKDB/TEKDB/forms.py |  9 +++++++--
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/TEKDB/TEKDB/admin.py b/TEKDB/TEKDB/admin.py
index 30236cd6..d26ecdee 100644
--- a/TEKDB/TEKDB/admin.py
+++ b/TEKDB/TEKDB/admin.py
@@ -448,6 +448,12 @@ class MediaBulkUploadAdmin(admin.ModelAdmin):
 
     def save_model(self, request, obj, form, change):
         super().save_model(request, obj, form, change)
+        places = form.cleaned_data.get('places')
+        resources = form.cleaned_data.get('resources')
+        citations = form.cleaned_data.get('citations')
+        activities = form.cleaned_data.get('activities')
+        placeresources = form.cleaned_data.get('placeresources')
+
         for file in request.FILES.getlist('files'):
             media_instance = Media(
                 medianame=obj.name,
@@ -457,6 +463,24 @@ def save_model(self, request, obj, form, change):
             media_instance.save()
             obj.mediabulkupload.add(media_instance)
 
+            # Add relationships
+            if places:
+                for place in places:
+                    PlacesMediaEvents.objects.create(placeid=place, mediaid=media_instance)
+            if resources:
+                for resource in resources:
+                    ResourcesMediaEvents.objects.create(resourceid=resource, mediaid=media_instance)
+            if citations:
+                for citation in citations:
+                    MediaCitationEvents.objects.create(citationid=citation, mediaid=media_instance)
+            if activities:
+                for activity in activities:
+                    ResourceActivityMediaEvents.objects.create(resourceactivityid=activity, mediaid=media_instance)
+            if placeresources:
+                for placeresource in placeresources:
+                    PlaceResourceMediaEvents.objects.create(placeresourceid=placeresource, mediaid=media_instance)
+
+
     def thumbnail_gallery(self, obj):
         thumbnails = [
             format_html('<img src="{}" width="100" height="100" />', media.mediafile.url)
@@ -465,12 +489,10 @@ def thumbnail_gallery(self, obj):
         return format_html(''.join(thumbnails))
 
     thumbnail_gallery.short_description = 'Thumbnails'
-
     readonly_fields = ('thumbnail_gallery',)
-
     fieldsets = (
         (None, {
-            'fields': ('name', 'description', 'files', 'date', 'thumbnail_gallery')
+            'fields': ('name', 'description', 'files', 'date', 'places', 'resources', 'citations', 'activities', 'placeresources', 'thumbnail_gallery')
         }),
     )
 
diff --git a/TEKDB/TEKDB/forms.py b/TEKDB/TEKDB/forms.py
index 015c31a6..8f010e81 100644
--- a/TEKDB/TEKDB/forms.py
+++ b/TEKDB/TEKDB/forms.py
@@ -1,5 +1,5 @@
 from django import forms
-from .models import MediaBulkUpload, Media
+from .models import MediaBulkUpload, Media, Places, Resources, Citations, ResourcesActivityEvents, PlacesResourceMediaEvents
 from .widgets import ThumbnailFileInput
 
 class MultipleFileInput(forms.ClearableFileInput):
@@ -24,7 +24,12 @@ def clean(self, data, initial=None):
 class MediaBulkUploadForm(forms.ModelForm):
     files = MultipleFileField()
     date = forms.DateField(widget=forms.SelectDateWidget)
+    places = forms.ModelMultipleChoiceField(queryset=Places.objects.all(), required=False)
+    resources = forms.ModelMultipleChoiceField(queryset=Resources.objects.all(), required=False)
+    citations = forms.ModelMultipleChoiceField(queryset=Citations.objects.all(), required=False)
+    activities = forms.ModelMultipleChoiceField(queryset=ResourcesActivityEvents.objects.all(), required=False)
+    placeresources = forms.ModelMultipleChoiceField(queryset=PlacesResourceMediaEvents.objects.all(), required=False)
 
     class Meta:
         model = MediaBulkUpload
-        fields = ['name', 'description', 'files', 'date']
\ No newline at end of file
+        fields = ['name', 'description', 'files', 'date', 'places', 'resources', 'citations', 'activities', 'placeresources']
\ No newline at end of file

From a4076b09ee32dac2a2ea2b87beaa6d1eeb4e3168 Mon Sep 17 00:00:00 2001
From: Anna Cho <103462904+bwithchewoo@users.noreply.github.com>
Date: Tue, 15 Oct 2024 11:00:15 -0700
Subject: [PATCH 14/16] changed how thumbnails are displayed based on file
 type, fixed None showing for indigenous and english names

---
 TEKDB/TEKDB/admin.py                          |  60 ++++++++++++++++--
 TEKDB/TEKDB/models.py                         |  24 ++++++-
 .../assets/audio-x-generic-symbolic.svg       |   1 +
 TEKDB/TEKDB/static/assets/doc-text.svg        |   1 +
 TEKDB/TEKDB/static/assets/unknown-mail.png    | Bin 0 -> 10506 bytes
 TEKDB/TEKDB/static/assets/video-x-generic.svg |   1 +
 TEKDB/explore/context_processors.py           |   1 +
 7 files changed, 82 insertions(+), 6 deletions(-)
 create mode 100644 TEKDB/TEKDB/static/assets/audio-x-generic-symbolic.svg
 create mode 100644 TEKDB/TEKDB/static/assets/doc-text.svg
 create mode 100644 TEKDB/TEKDB/static/assets/unknown-mail.png
 create mode 100644 TEKDB/TEKDB/static/assets/video-x-generic.svg

diff --git a/TEKDB/TEKDB/admin.py b/TEKDB/TEKDB/admin.py
index 620b1cd9..8d10070b 100644
--- a/TEKDB/TEKDB/admin.py
+++ b/TEKDB/TEKDB/admin.py
@@ -6,6 +6,8 @@
 from django.utils.html import format_html
 from django.utils.translation import ugettext, ugettext_lazy as _
 from dal import autocomplete
+from mimetypes import guess_type
+from django.templatetags.static import static
 # from moderation.admin import ModerationAdmin
 import nested_admin
 from ckeditor.widgets import CKEditorWidget
@@ -461,10 +463,60 @@ def save_model(self, request, obj, form, change):
             obj.mediabulkupload.add(media_instance)
 
     def thumbnail_gallery(self, obj):
-        thumbnails = [
-            format_html('<img src="{}" width="100" height="100" />', media.mediafile.url)
-            for media in obj.mediabulkupload.all()
-        ]
+        thumbnails = []
+        for media in obj.mediabulkupload.all():
+            # Guess the MIME type of the file
+            mime_type, _ = guess_type(media.mediafile.url)
+
+            file_name = media.mediafile.name
+
+            if mime_type:
+                if mime_type.startswith('image'):
+                    thumbnails.append(format_html(
+                        '<div style="display:inline-block; text-align:center; margin: 10px;">'
+                        '<img src="{}" width="100" height="100" />'
+                        '<br /><span style="display:block; width: 100px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">{}</span>'
+                        '</div>', media.mediafile.url, file_name))
+                elif mime_type.startswith('video'):
+                    thumbnails.append(format_html(
+                        '<div style="display:inline-block; text-align:center; margin: 10px;">'
+                        '<video width="100" height="100" controls>'
+                        '<source src="{}" type="{}">'
+                        'Your browser does not support the video tag.'
+                        '</video>'
+                        '<br /><span style="display:block; width: 100px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">{}</span>'
+                        '</div>', media.mediafile.url, mime_type, file_name))
+                elif mime_type.startswith('audio'):
+                    generic_audio_icon = static('assets/audio-x-generic.svg')
+                    thumbnails.append(format_html(
+                        '<div style="display:inline-block; text-align:center; margin: 10px;">'
+                        '<img src="{}" width="100" height="100" alt="Audio File" />'
+                        '<br /><span style="display:block; width: 100px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">{}</span>'
+                        '</div>', generic_audio_icon, file_name))
+                elif mime_type.startswith('text') or 'application/msword' in mime_type or 'application/vnd' in mime_type:
+                    generic_doc_icon = static('assets/doc-text.svg')
+                    thumbnails.append(format_html(
+                        '<div style="display:inline-block; text-align:center; margin: 10px;">'
+                        '<img src="{}" width="100" height="100" alt="Document File" />'
+                        '<br /><span style="display:block; width: 100px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">{}</span>'
+                        '</div>', generic_doc_icon, file_name))
+                else:
+                    # For unknown or other file types, show a generic file image
+                    generic_file_icon = static('assets/unknown-mail.png')
+                    thumbnails.append(format_html(
+                        '<div style="display:inline-block; text-align:center; margin: 10px;">'
+                        '<img src="{}" width="100" height="100" alt="File" />'
+                        '<br /><span style="display:block; width: 100px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">{}</span>'
+                        '</div>', generic_file_icon, file_name))
+            else:
+                # In case the MIME type could not be determined, use a generic file icon
+                generic_file_icon = static('assets/unknown-mail.png')
+                thumbnails.append(format_html(
+                    '<div style="display:inline-block; text-align:center; margin: 10px;">'
+                    '<img src="{}" width="100" height="100" alt="File" />'
+                    '<br /><span style="display:block; width: 100px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">{}</span>'
+                    '</div>', generic_file_icon, file_name))
+
         return format_html(''.join(thumbnails))
 
     thumbnail_gallery.short_description = 'Thumbnails'
diff --git a/TEKDB/TEKDB/models.py b/TEKDB/TEKDB/models.py
index 1520bb16..475c2181 100644
--- a/TEKDB/TEKDB/models.py
+++ b/TEKDB/TEKDB/models.py
@@ -512,10 +512,30 @@ def get_related_objects(self, object_id):
         ]
 
     def __unicode__(self):
-        return unicode('%s (%s)' % (self.indigenousplacename, self.englishplacename))
+        indigenous = self.indigenousplacename or ""
+        english = self.englishplacename or ""
+
+        if indigenous and english:
+            return u'%s (%s)' % (indigenous, english)
+        elif indigenous:
+            return unicode(indigenous)
+        elif english:
+            return unicode(english)
+        else:
+            return u'No Name Given'
 
     def __str__(self):
-        return "%s (%s)" % (self.indigenousplacename, self.englishplacename) or ''
+        indigenous = self.indigenousplacename or ""
+        english = self.englishplacename or ""
+
+        if indigenous and english:
+            return "%s (%s)" % (indigenous, english)
+        elif indigenous:
+            return indigenous
+        elif english:
+            return english
+        else:
+            return "No Name Given"
 
 class LookupResourceGroup(DefaultModeratedModel, ModeratedModel):
     id = models.AutoField(db_column='id', primary_key=True)
diff --git a/TEKDB/TEKDB/static/assets/audio-x-generic-symbolic.svg b/TEKDB/TEKDB/static/assets/audio-x-generic-symbolic.svg
new file mode 100644
index 00000000..e62ffdf8
--- /dev/null
+++ b/TEKDB/TEKDB/static/assets/audio-x-generic-symbolic.svg
@@ -0,0 +1 @@
+<svg height="16.008" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m1046.37-267-7.376 1.906c-.554.149-1 .74-1 1.313v9.094a2.84 2.84 0 0 0 -2.03-.22c-1.35.351-2.196 1.485-1.907 2.532.29 1.047 1.619 1.632 2.969 1.281 1.076-.28 1.819-1.071 1.937-1.906l.031-8.594 7-1.875v6.781a2.84 2.84 0 0 0 -2.031-.218c-1.35.35-2.196 1.484-1.906 2.531.289 1.047 1.619 1.632 2.968 1.281 1.077-.28 1.82-1.071 1.938-1.906l.03-11.188c0-.43-.265-.751-.624-.812z" fill="#666" transform="translate(-1033 267)"/></svg>
\ No newline at end of file
diff --git a/TEKDB/TEKDB/static/assets/doc-text.svg b/TEKDB/TEKDB/static/assets/doc-text.svg
new file mode 100644
index 00000000..0993a48a
--- /dev/null
+++ b/TEKDB/TEKDB/static/assets/doc-text.svg
@@ -0,0 +1 @@
+<svg height="56" viewBox="0 0 56 56" width="56" xmlns="http://www.w3.org/2000/svg"><path d="m15.5547 53.125h24.8906c4.8516 0 7.2656-2.461 7.2656-7.336v-21.2812c0-3.0234-.3281-4.336-2.2031-6.2578l-12.9375-13.1485c-1.7812-1.8281-3.2344-2.2265-5.8828-2.2265h-11.1328c-4.8281 0-7.2656 2.4844-7.2656 7.3594v35.5546c0 4.8985 2.4375 7.336 7.2656 7.336zm.1875-3.7735c-2.4141 0-3.6797-1.289-3.6797-3.6328v-35.414c0-2.3203 1.2656-3.6563 3.7031-3.6563h10.4062v13.6172c0 2.9531 1.5 4.4062 4.4063 4.4062h13.3594v21.0469c0 2.3438-1.2422 3.6328-3.6797 3.6328zm15.2578-28.2187c-.9141 0-1.2891-.375-1.2891-1.3125v-12.4453l13.5 13.7578zm5.625 9.9844h-17.7891c-.8437 0-1.4531.6328-1.4531 1.4297 0 .8203.6094 1.4531 1.4531 1.4531h17.7891c.8203 0 1.4531-.6328 1.4531-1.4531 0-.7969-.6328-1.4297-1.4531-1.4297zm0 8.1797h-17.7891c-.8437 0-1.4531.6562-1.4531 1.4765 0 .7969.6094 1.4063 1.4531 1.4063h17.7891c.8203 0 1.4531-.6094 1.4531-1.4063 0-.8203-.6328-1.4765-1.4531-1.4765z" style="fill:white"/></svg>
\ No newline at end of file
diff --git a/TEKDB/TEKDB/static/assets/unknown-mail.png b/TEKDB/TEKDB/static/assets/unknown-mail.png
new file mode 100644
index 0000000000000000000000000000000000000000..7620a662c8c98a7315970d2ca8cc2a051b7b0d48
GIT binary patch
literal 10506
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

literal 0
HcmV?d00001

diff --git a/TEKDB/TEKDB/static/assets/video-x-generic.svg b/TEKDB/TEKDB/static/assets/video-x-generic.svg
new file mode 100644
index 00000000..a208932d
--- /dev/null
+++ b/TEKDB/TEKDB/static/assets/video-x-generic.svg
@@ -0,0 +1 @@
+<svg height="64" viewBox="0 0 64 64" width="64" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><linearGradient id="a" gradientTransform="matrix(1 0 0 .84587 -1 -272.73)" gradientUnits="userSpaceOnUse" x2="0" y1="392.36" y2="324.66"><stop offset="0" stop-color="#fff" stop-opacity="0"/><stop offset="1" stop-color="#fff" stop-opacity=".2"/></linearGradient><path id="b" d="m3 17v44h58v-44h-18.455z"/></defs><use fill="#777" xlink:href="#b"/><g><path d="m3 60h58v1h-58z" opacity=".35"/><path d="m3 17h58v1h-58z" fill="#fff" opacity=".4"/></g><g fill="#fff"><path d="m32 28.00002a11 11 0 0 0 -11 11 11 11 0 0 0 11 11 11 11 0 0 0 11-11 11 11 0 0 0 -11-11m.14453.95117a10 10 0 0 1 10 10 10 10 0 0 1 -10 10 10 10 0 0 1 -10-10 10 10 0 0 1 10-10" opacity=".75"/><g><path d="m38.38 38.962-10 5.538v-11z" opacity=".75"/><path d="m55 19v4h4v-4zm0 6v4h4v-4zm0 6v4h4v-4zm0 6v4h4v-4zm0 6v4h4v-4zm0 6v4h4v-4zm0 6v4h4v-4z" opacity=".75"/><path d="m5 19v4h4v-4zm0 6v4h4v-4zm0 6v4h4v-4zm0 6v4h4v-4zm0 6v4h4v-4zm0 6v4h4v-4zm0 6v4h4v-4z" opacity=".75"/></g></g><use fill="url(#a)" xlink:href="#b"/></svg>
\ No newline at end of file
diff --git a/TEKDB/explore/context_processors.py b/TEKDB/explore/context_processors.py
index 6579a656..1ca70275 100644
--- a/TEKDB/explore/context_processors.py
+++ b/TEKDB/explore/context_processors.py
@@ -20,6 +20,7 @@ def explore_context(request):
     ######################################
 
     project_logo_text = 'ITK'
+    # project_text_placement = "default"
 
     if settings:
         try:

From 6c8101a8bab29cbd431404b9e6d76b75066f9019 Mon Sep 17 00:00:00 2001
From: David Pollard <pollardld@gmail.com>
Date: Wed, 16 Oct 2024 16:03:04 -0700
Subject: [PATCH 15/16] Use convention for MediaBulkUpload Model of class
 parameters Queryable, Record, Reviewable, and ModeratedMedia

---
 TEKDB/TEKDB/admin.py                          |  8 ++-
 TEKDB/TEKDB/forms.py                          |  4 +-
 .../migrations/0016_auto_20241016_1549.py     | 71 +++++++++++++++++++
 .../migrations/0017_auto_20241016_1552.py     | 32 +++++++++
 TEKDB/TEKDB/models.py                         | 32 ++++-----
 5 files changed, 122 insertions(+), 25 deletions(-)
 create mode 100644 TEKDB/TEKDB/migrations/0016_auto_20241016_1549.py
 create mode 100644 TEKDB/TEKDB/migrations/0017_auto_20241016_1552.py

diff --git a/TEKDB/TEKDB/admin.py b/TEKDB/TEKDB/admin.py
index e905e817..2dfdbbed 100644
--- a/TEKDB/TEKDB/admin.py
+++ b/TEKDB/TEKDB/admin.py
@@ -448,6 +448,8 @@ class CitationsAdmin(RecordAdminProxy, RecordModelAdmin):
 class MediaBulkUploadAdmin(admin.ModelAdmin):
     form = MediaBulkUploadForm
 
+    list_display = ('mediabulkname',)
+
     def save_model(self, request, obj, form, change):
         super().save_model(request, obj, form, change)
         places = form.cleaned_data.get('places')
@@ -458,8 +460,8 @@ def save_model(self, request, obj, form, change):
 
         for file in request.FILES.getlist('files'):
             media_instance = Media(
-                medianame=obj.name,
-                mediadescription=obj.description,
+                medianame=obj.mediabulkname,
+                mediadescription=obj.mediabulkdescription,
                 mediafile=file,
             )
             media_instance.save()
@@ -544,7 +546,7 @@ def thumbnail_gallery(self, obj):
     readonly_fields = ('thumbnail_gallery',)
     fieldsets = (
         (None, {
-            'fields': ('name', 'description', 'files', 'date', 'places', 'resources', 'citations', 'activities', 'placeresources', 'thumbnail_gallery')
+            'fields': ('mediabulkname', 'mediabulkdescription', 'files', 'mediabulkdate', 'places', 'resources', 'citations', 'activities', 'placeresources', 'thumbnail_gallery')
         }),
     )
 
diff --git a/TEKDB/TEKDB/forms.py b/TEKDB/TEKDB/forms.py
index 8f010e81..c53a696d 100644
--- a/TEKDB/TEKDB/forms.py
+++ b/TEKDB/TEKDB/forms.py
@@ -23,7 +23,7 @@ def clean(self, data, initial=None):
 
 class MediaBulkUploadForm(forms.ModelForm):
     files = MultipleFileField()
-    date = forms.DateField(widget=forms.SelectDateWidget)
+    mediabulkdate = forms.DateField(widget=forms.SelectDateWidget)
     places = forms.ModelMultipleChoiceField(queryset=Places.objects.all(), required=False)
     resources = forms.ModelMultipleChoiceField(queryset=Resources.objects.all(), required=False)
     citations = forms.ModelMultipleChoiceField(queryset=Citations.objects.all(), required=False)
@@ -32,4 +32,4 @@ class MediaBulkUploadForm(forms.ModelForm):
 
     class Meta:
         model = MediaBulkUpload
-        fields = ['name', 'description', 'files', 'date', 'places', 'resources', 'citations', 'activities', 'placeresources']
\ No newline at end of file
+        fields = ['mediabulkname', 'mediabulkdescription', 'files', 'mediabulkdate', 'places', 'resources', 'citations', 'activities', 'placeresources']
\ No newline at end of file
diff --git a/TEKDB/TEKDB/migrations/0016_auto_20241016_1549.py b/TEKDB/TEKDB/migrations/0016_auto_20241016_1549.py
new file mode 100644
index 00000000..823f0def
--- /dev/null
+++ b/TEKDB/TEKDB/migrations/0016_auto_20241016_1549.py
@@ -0,0 +1,71 @@
+# Generated by Django 3.2.25 on 2024-10-16 22:49
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('TEKDB', '0015_auto_20241004_1559'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='mediabulkupload',
+            name='created_at',
+        ),
+        migrations.RemoveField(
+            model_name='mediabulkupload',
+            name='updated_at',
+        ),
+        migrations.AddField(
+            model_name='mediabulkupload',
+            name='enteredbydate',
+            field=models.DateTimeField(auto_now_add=True, db_column='enteredbydate', null=True, verbose_name='entered by date'),
+        ),
+        migrations.AddField(
+            model_name='mediabulkupload',
+            name='enteredbyname',
+            field=models.CharField(blank=True, db_column='enteredbyname', max_length=25, null=True, verbose_name='entered by name'),
+        ),
+        migrations.AddField(
+            model_name='mediabulkupload',
+            name='enteredbytitle',
+            field=models.CharField(blank=True, db_column='enteredbytitle', max_length=100, null=True, verbose_name='entered by title'),
+        ),
+        migrations.AddField(
+            model_name='mediabulkupload',
+            name='enteredbytribe',
+            field=models.CharField(blank=True, db_column='enteredbytribe', max_length=100, null=True, verbose_name='entered by tribe'),
+        ),
+        migrations.AddField(
+            model_name='mediabulkupload',
+            name='modifiedbydate',
+            field=models.DateTimeField(auto_now=True, db_column='modifiedbydate', null=True, verbose_name='modified by date'),
+        ),
+        migrations.AddField(
+            model_name='mediabulkupload',
+            name='modifiedbyname',
+            field=models.CharField(blank=True, db_column='modifiedbyname', max_length=25, null=True, verbose_name='modified by name'),
+        ),
+        migrations.AddField(
+            model_name='mediabulkupload',
+            name='modifiedbytitle',
+            field=models.CharField(blank=True, db_column='modifiedbytitle', max_length=100, null=True, verbose_name='modified by title'),
+        ),
+        migrations.AddField(
+            model_name='mediabulkupload',
+            name='modifiedbytribe',
+            field=models.CharField(blank=True, db_column='modifiedbytribe', max_length=100, null=True, verbose_name='modified by tribe'),
+        ),
+        migrations.AddField(
+            model_name='mediabulkupload',
+            name='needsReview',
+            field=models.BooleanField(db_column='needsreview', default=True, verbose_name='Needs Review'),
+        ),
+        migrations.AddField(
+            model_name='mediabulkupload',
+            name='researchComments',
+            field=models.TextField(blank=True, db_column='researchcomments', default=None, null=True, verbose_name='Research Comments'),
+        ),
+    ]
diff --git a/TEKDB/TEKDB/migrations/0017_auto_20241016_1552.py b/TEKDB/TEKDB/migrations/0017_auto_20241016_1552.py
new file mode 100644
index 00000000..d1835fd1
--- /dev/null
+++ b/TEKDB/TEKDB/migrations/0017_auto_20241016_1552.py
@@ -0,0 +1,32 @@
+# Generated by Django 3.2.25 on 2024-10-16 22:52
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('TEKDB', '0016_auto_20241016_1549'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='mediabulkupload',
+            old_name='date',
+            new_name='mediabulkdate',
+        ),
+        migrations.RenameField(
+            model_name='mediabulkupload',
+            old_name='description',
+            new_name='mediabulkdescription',
+        ),
+        migrations.RenameField(
+            model_name='mediabulkupload',
+            old_name='name',
+            new_name='mediabulkname',
+        ),
+        migrations.RemoveField(
+            model_name='mediabulkupload',
+            name='user',
+        ),
+    ]
diff --git a/TEKDB/TEKDB/models.py b/TEKDB/TEKDB/models.py
index 35b52728..ba13dc1a 100644
--- a/TEKDB/TEKDB/models.py
+++ b/TEKDB/TEKDB/models.py
@@ -1851,31 +1851,23 @@ def __str__(self):
         return self.username or ''
 
 
-#   * Media Collection
-#   * 
-
-# Through tables or one to many relationship, reference Anna's work on MidA
-#   * PlacesMediaEvents
-#   * ResourcesMediaEvents
-#   * MediaCitationEvents
-#   * ResourceActivityMediaEvents
-#   * PlacesResourceMediaEvents
-
-# add Sorting 
-class MediaBulkUpload(models.Model):
-    name = models.CharField(max_length=255, blank=True, null=True)
-    description = models.TextField(blank=True, null=True)
-    date = models.DateField(blank=True, null=True, default=None)
-    created_at = models.DateTimeField(auto_now_add=True, blank=True, null=True)
-    updated_at = models.DateTimeField(auto_now=True, blank=True, null=True)
-    user = models.ForeignKey(LookupUserInfo, db_column='user', blank=True, null=True, verbose_name='user', default=None, on_delete=models.SET_DEFAULT)
+#   * Bulk Media Upload 
+#   formerly known as Media Collection
+# class MediaBulkUpload(models.Model):
+class MediaBulkUpload(Reviewable, Queryable, Record, ModeratedModel):
+    mediabulkname = models.CharField(max_length=255, blank=True, null=True)
+    mediabulkdescription = models.TextField(blank=True, null=True)
+    mediabulkdate = models.DateField(blank=True, null=True, default=None)
+    # created_at = models.DateTimeField(auto_now_add=True, blank=True, null=True)
+    # modifieddate = models.DateTimeField(auto_now=True, blank=True, null=True)
+    # user = models.ForeignKey(LookupUserInfo, db_column='user', blank=True, null=True, verbose_name='user', default=None, on_delete=models.SET_DEFAULT)
     
+    # todo add Sorting 
     # @property
     # def count(self):
         # number of media items uploaded
 
-    # Suggested Additions
-    # Multi upload
+    
     # Visual displayed of uploads
         # Example in blue pages
         # Gallery of Media 

From 5d37198aa20b3116993508dae18b41e05411e95a Mon Sep 17 00:00:00 2001
From: David Pollard <pollardld@gmail.com>
Date: Wed, 16 Oct 2024 18:11:27 -0700
Subject: [PATCH 16/16] Add additional sorting options to list view

---
 TEKDB/TEKDB/admin.py  |  2 +-
 TEKDB/TEKDB/models.py | 40 +---------------------------------------
 2 files changed, 2 insertions(+), 40 deletions(-)

diff --git a/TEKDB/TEKDB/admin.py b/TEKDB/TEKDB/admin.py
index 2dfdbbed..a8d542d9 100644
--- a/TEKDB/TEKDB/admin.py
+++ b/TEKDB/TEKDB/admin.py
@@ -448,7 +448,7 @@ class CitationsAdmin(RecordAdminProxy, RecordModelAdmin):
 class MediaBulkUploadAdmin(admin.ModelAdmin):
     form = MediaBulkUploadForm
 
-    list_display = ('mediabulkname',)
+    list_display = ('mediabulkname','mediabulkdate','modifiedbydate','enteredbydate',)
 
     def save_model(self, request, obj, form, change):
         super().save_model(request, obj, form, change)
diff --git a/TEKDB/TEKDB/models.py b/TEKDB/TEKDB/models.py
index ba13dc1a..b461b4c7 100644
--- a/TEKDB/TEKDB/models.py
+++ b/TEKDB/TEKDB/models.py
@@ -1853,54 +1853,16 @@ def __str__(self):
 
 #   * Bulk Media Upload 
 #   formerly known as Media Collection
-# class MediaBulkUpload(models.Model):
 class MediaBulkUpload(Reviewable, Queryable, Record, ModeratedModel):
     mediabulkname = models.CharField(max_length=255, blank=True, null=True)
     mediabulkdescription = models.TextField(blank=True, null=True)
     mediabulkdate = models.DateField(blank=True, null=True, default=None)
-    # created_at = models.DateTimeField(auto_now_add=True, blank=True, null=True)
-    # modifieddate = models.DateTimeField(auto_now=True, blank=True, null=True)
-    # user = models.ForeignKey(LookupUserInfo, db_column='user', blank=True, null=True, verbose_name='user', default=None, on_delete=models.SET_DEFAULT)
     
-    # todo add Sorting 
     # @property
     # def count(self):
         # number of media items uploaded
 
-    
-    # Visual displayed of uploads
-        # Example in blue pages
-        # Gallery of Media 
-        # Ability to edit Media
-
-    # Media Fields + Relationships
-    # mediatype = models.ForeignKey(LookupMediaType, db_column='mediatype', max_length=255, blank=True, null=True, verbose_name='type', default=None, on_delete=models.SET_DEFAULT)
-    # medianame = models.CharField(db_column='medianame', max_length=255, blank=True, null=True, verbose_name='name')
-    # mediadescription = RichTextField(db_column='mediadescription', blank=True, null=True, verbose_name='description', config_name="custom") #CKEditor Rich Text Editor Field
-    # medialink = models.CharField(db_column='medialink', max_length=255, blank=True, null=True, verbose_name='historic location')
-    # mediafile = models.FileField(db_column='mediafile', max_length=255, blank=True, null=True, verbose_name='file')
-    
-    # PlaceMedia relationship
-    # other 5 relationships ...
-    # def relationships(self):
-    # relationship_list = []
-    # places = [x.get_relationship_json(type(self)) for x in self.placesmediaevents_set.all()]
-    # if len(places) > 0:
-    #     relationship_list.append({'key': 'Places', 'value': places})
-    # resources = [x.get_relationship_json(type(self)) for x in self.resourcesmediaevents_set.all()]
-    # if len(resources) > 0:
-    #     relationship_list.append({'key': 'Resources', 'value': resources})
-    # citations = [x.get_relationship_json(type(self)) for x in self.mediacitationevents_set.all()]
-    # if len(citations) > 0:
-    #     relationship_list.append({'key': 'Bibliographic Sources', 'value': citations})
-    # activities = [x.get_relationship_json(type(self)) for x in self.resourceactivitymediaevents_set.all()]
-    # if len(activities) > 0:
-    #     relationship_list.append({'key': 'Activities', 'value': activities})
-    # placeresources = [x.get_relationship_json(type(self)) for x in self.placesresourcemediaevents_set.all()]
-    # if len(placeresources) > 0:
-    #     relationship_list.append({'key': 'Place-Resources', 'value': placeresources})
-    # return relationship_list
-
+    # Ability to edit Media
 
 class Media(Reviewable, Queryable, Record, ModeratedModel):
     mediaid = models.AutoField(db_column='mediaid', primary_key=True)