From e9749e4b30fdd770abdfc7c9851d57dfb738a071 Mon Sep 17 00:00:00 2001 From: Hillel Arnold Date: Thu, 19 Sep 2019 08:53:57 -0400 Subject: [PATCH 01/28] hides My Transfers tab for users who have none, fixes #359 --- aurora/bag_transfer/templates/orgs/transfers.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/aurora/bag_transfer/templates/orgs/transfers.html b/aurora/bag_transfer/templates/orgs/transfers.html index b649027a..9b9382dc 100644 --- a/aurora/bag_transfer/templates/orgs/transfers.html +++ b/aurora/bag_transfer/templates/orgs/transfers.html @@ -13,15 +13,19 @@ From 9deff03763fae0871eaca16f59a43a955ae33d77 Mon Sep 17 00:00:00 2001 From: Hillel Arnold Date: Thu, 19 Sep 2019 14:41:15 -0400 Subject: [PATCH 02/28] show confirmation modal in appraisal queue, fixes #345 --- .../templates/appraise/confirm_modal.html | 27 +++++++ .../bag_transfer/templates/appraise/main.html | 74 +++++++++++++++---- 2 files changed, 85 insertions(+), 16 deletions(-) create mode 100644 aurora/bag_transfer/templates/appraise/confirm_modal.html diff --git a/aurora/bag_transfer/templates/appraise/confirm_modal.html b/aurora/bag_transfer/templates/appraise/confirm_modal.html new file mode 100644 index 00000000..e189ea52 --- /dev/null +++ b/aurora/bag_transfer/templates/appraise/confirm_modal.html @@ -0,0 +1,27 @@ + diff --git a/aurora/bag_transfer/templates/appraise/main.html b/aurora/bag_transfer/templates/appraise/main.html index a9aed6c3..f276f0e7 100644 --- a/aurora/bag_transfer/templates/appraise/main.html +++ b/aurora/bag_transfer/templates/appraise/main.html @@ -35,11 +35,13 @@ {% block modals %} {% include 'appraise/edit_note.html' %} {% include 'appraise/detail_modal.html' %} + {% include 'appraise/confirm_modal.html' %} {% endblock %} {% block extra_js %} - + @@ -17,5 +17,4 @@ - From 8b472ad952adcae16a6056322f43db370b8b3faf Mon Sep 17 00:00:00 2001 From: Hillel Arnold Date: Fri, 20 Sep 2019 09:03:26 -0400 Subject: [PATCH 08/28] styling for appraise --- aurora/bag_transfer/templates/appraise/main.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/aurora/bag_transfer/templates/appraise/main.html b/aurora/bag_transfer/templates/appraise/main.html index 30b2cdcc..8f2d7973 100644 --- a/aurora/bag_transfer/templates/appraise/main.html +++ b/aurora/bag_transfer/templates/appraise/main.html @@ -49,6 +49,12 @@ $(function () { $.fn.dataTable.moment( 'MMM D, YYYY h:mm A' ); $('#appraise_table').DataTable({ + 'columnDefs': [ + { + width: "20%", + targets: [5] + } + ], 'createdRow': function(row, data, dataIndex) { $(row).attr('data-transfer-id', data[6]); $(row).attr('data-transfer-name', data[0]); From 1edadbc99f39c7c5d9cb470cb27fb2ac8c87ea27 Mon Sep 17 00:00:00 2001 From: Hillel Arnold Date: Tue, 24 Sep 2019 12:34:58 -0500 Subject: [PATCH 09/28] debug view --- aurora/bag_transfer/accession/views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aurora/bag_transfer/accession/views.py b/aurora/bag_transfer/accession/views.py index 969c8ad3..a3a2ad4e 100644 --- a/aurora/bag_transfer/accession/views.py +++ b/aurora/bag_transfer/accession/views.py @@ -215,8 +215,8 @@ def handle_ajax_request(self, request): class SavedAccessionsDatatableView(ArchivistMixin, BaseDatatableView): model = Accession - columns = ['title', 'created', 'extent_files', 'extent_size'] - order_columns = ['title', 'created', 'extent_files', 'extent_size'] + columns = ['title', 'created', 'extent_files', 'accession_transfers__machine_file_identifier', 'extent_size'] + order_columns = ['title', 'created', 'extent_files', 'accession_transfers__machine_file_identifier', 'extent_size'] max_display_length = 500 def get_filter_method(self): return self.FILTER_ICONTAINS From 0ac7ae438068cd643ffdd8ec4fe458f4c567d34b Mon Sep 17 00:00:00 2001 From: Hillel Arnold Date: Tue, 24 Sep 2019 12:46:22 -0500 Subject: [PATCH 10/28] draws table on tab change so top header is sticky --- aurora/bag_transfer/templates/accession/main.html | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/aurora/bag_transfer/templates/accession/main.html b/aurora/bag_transfer/templates/accession/main.html index 446bc43d..2299067a 100644 --- a/aurora/bag_transfer/templates/accession/main.html +++ b/aurora/bag_transfer/templates/accession/main.html @@ -81,9 +81,8 @@