From 66a2efdfe27a6b00b2f059a7aa9246809a849902 Mon Sep 17 00:00:00 2001 From: peggles2 Date: Fri, 1 Mar 2024 13:45:48 -0500 Subject: [PATCH] EREGCSC-2511-add-columns-admin-panel (#1188) * EREGCSC-2511-add-columns-admin-panel * initial load --- solution/backend/file_manager/admin.py | 13 +++++++------ .../migrations/0016_uploadedfile_updated_at.py | 18 ++++++++++++++++++ solution/backend/file_manager/models.py | 1 + .../backend/file_manager/serializers/files.py | 1 + solution/backend/resources/admin.py | 4 ++-- 5 files changed, 29 insertions(+), 8 deletions(-) create mode 100644 solution/backend/file_manager/migrations/0016_uploadedfile_updated_at.py diff --git a/solution/backend/file_manager/admin.py b/solution/backend/file_manager/admin.py index ff989b612c..68791dba14 100644 --- a/solution/backend/file_manager/admin.py +++ b/solution/backend/file_manager/admin.py @@ -61,14 +61,15 @@ class Meta: @admin.register(UploadedFile) class UploadedFileAdmin(BaseAdmin): form = UploadAdminForm - list_display = ("document_name", "index_populated") + list_display = ("date", "document_name", "category", "updated_at", "index_populated") search_fields = ["document_name"] - ordering = ("document_name",) + ordering = ("date", "document_name", "category", "updated_at",) filter_horizontal = ("locations", "subjects") - readonly_fields = ('download_file', 'file_name', 'get_content', 'index_populated') - fields = ("file_name", "file_path", "document_name", 'date', 'summary', - 'document_type', 'subjects', 'locations', 'internal_notes', - 'index_populated', 'get_content', 'download_file', 'category',) + readonly_fields = ("download_file", "file_name", "get_content", "updated_at", "index_populated") + fields = ("file_name", "file_path", "document_name", "date", "summary", + "updated_at", "document_type", "subjects", "locations", "internal_notes", + "index_populated", "get_content", "download_file", "category",) + manytomany_lookups = { "locations": lambda: AbstractLocation.objects.all().select_subclasses(), "subjects": lambda: Subject.objects.all() diff --git a/solution/backend/file_manager/migrations/0016_uploadedfile_updated_at.py b/solution/backend/file_manager/migrations/0016_uploadedfile_updated_at.py new file mode 100644 index 0000000000..91e08dcb5e --- /dev/null +++ b/solution/backend/file_manager/migrations/0016_uploadedfile_updated_at.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.24 on 2024-02-27 14:17 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('file_manager', '0015_auto_20231207_1615'), + ] + + operations = [ + migrations.AddField( + model_name='uploadedfile', + name='updated_at', + field=models.DateTimeField(auto_now=True), + ), + ] diff --git a/solution/backend/file_manager/models.py b/solution/backend/file_manager/models.py index fd738903ae..b866dab483 100644 --- a/solution/backend/file_manager/models.py +++ b/solution/backend/file_manager/models.py @@ -71,6 +71,7 @@ class UploadedFile(models.Model): internal_notes = models.TextField(null=True, blank=True) subjects = models.ManyToManyField(Subject, blank=True, related_name="uploads") document_type = models.ForeignKey(DocumentType, blank=True, null=True, related_name="uploads", on_delete=models.SET_NULL) + updated_at = models.DateTimeField(auto_now=True) category = models.ForeignKey( AbstractRepoCategory, null=True, blank=True, on_delete=models.SET_NULL, related_name="uploads" ) diff --git a/solution/backend/file_manager/serializers/files.py b/solution/backend/file_manager/serializers/files.py index 4d7e8b7749..d92540cc14 100644 --- a/solution/backend/file_manager/serializers/files.py +++ b/solution/backend/file_manager/serializers/files.py @@ -8,6 +8,7 @@ class UploadedFileSerializer(DetailsSerializer, serializers.Serializer, ): + updated_at = serializers.CharField() document_name = serializers.CharField() file_name = serializers.CharField() date = serializers.DateField() diff --git a/solution/backend/resources/admin.py b/solution/backend/resources/admin.py index aaabf50b34..215cf7667f 100644 --- a/solution/backend/resources/admin.py +++ b/solution/backend/resources/admin.py @@ -419,7 +419,7 @@ class SupplementalContentAdmin(AbstractResourceAdmin): change_list_template = "admin/import_resources_button.html" form = SupContentForm readonly_fields = ("get_content", "index_populated") - list_display = ("date", "name", "description", "category", "updated_at", "approved", "name_sort") + list_display = ("date", "name", "description", "category", "updated_at", "approved", "name_sort", "index_populated") list_display_links = ("date", "name", "description", "category", "updated_at") search_fields = ["date", "name", "description"] @@ -576,7 +576,7 @@ class FederalRegisterDocumentAdmin(AbstractResourceAdmin): form = FederalResourceForm readonly_fields = ('index_populated', 'get_content') list_display = ("date", "name", "description", "in_group", "docket_numbers", - "document_number", "category", "doc_type", "updated_at", "approved") + "document_number", "category", "doc_type", "updated_at", "approved", "index_populated") list_display_links = ("date", "name", "description", "in_group", "docket_numbers", "document_number", "category", "doc_type", "updated_at") search_fields = ["date", "name", "description", "docket_numbers", "document_number"]