From b0b2d18058f2ffc7365f3d26eca9f051ec7054ee Mon Sep 17 00:00:00 2001 From: Hillel Arnold Date: Mon, 27 Jun 2022 16:41:13 -0400 Subject: [PATCH 1/6] fix import script --- scripts/import_sample_data | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/import_sample_data b/scripts/import_sample_data index 8e202408..e90fc68c 100755 --- a/scripts/import_sample_data +++ b/scripts/import_sample_data @@ -3,6 +3,6 @@ # Script to import set of sample bags # Copies files to data upload directory and then runs cron -cp -r ../sample_bags/* /data/donororganization/upload/ +cp -r sample_bags/* /data/donororganization/upload/ chown -R donor /data/donororganization/upload/ python manage.py runcrons bag_transfer.lib.cron.DiscoverTransfers From da9c31027931383232a2dbeeef857f8f216da3e7 Mon Sep 17 00:00:00 2001 From: Hillel Arnold Date: Mon, 27 Jun 2022 16:41:48 -0400 Subject: [PATCH 2/6] turn rights bases into list --- bag_transfer/templates/parts/rights_table.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bag_transfer/templates/parts/rights_table.html b/bag_transfer/templates/parts/rights_table.html index bf241989..91f2e65f 100644 --- a/bag_transfer/templates/parts/rights_table.html +++ b/bag_transfer/templates/parts/rights_table.html @@ -11,7 +11,7 @@ {% for statement in org.rights_statements %} - {% for t in statement.applies_to_type.all %}{{t.name}}{% if not forloop.last %}
{%endif%}{% endfor %} + {{statement.rights_basis}} {{statement.rights_info_notes}} From 95ff2df9dde6eccbfeb76b7d2bb80beee73a260a Mon Sep 17 00:00:00 2001 From: Hillel Arnold Date: Mon, 27 Jun 2022 16:42:02 -0400 Subject: [PATCH 3/6] move rights display box higher --- bag_transfer/templates/transfers/detail.html | 30 ++++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/bag_transfer/templates/transfers/detail.html b/bag_transfer/templates/transfers/detail.html index d9dd4a95..c282eaaf 100644 --- a/bag_transfer/templates/transfers/detail.html +++ b/bag_transfer/templates/transfers/detail.html @@ -64,6 +64,21 @@

Error Messages

{% endif %} +{% if object.rights_statements.all %} +
+
+
+
+

Rights Statements

+
+
+ {% include 'parts/transfer_rights_table.html' with rights_statements=object.rights_statements.all %} +
+
+
+
+{% endif %} +
@@ -92,21 +107,6 @@

Log

-{% if object.rights_statements.all %} -
-
-
-
-

Rights Statements

-
-
- {% include 'parts/transfer_rights_table.html' with rights_statements=object.rights_statements.all %} -
-
-
-
-{% endif %} - {% if object.archivesspace_identifier or object.archivesspace_parent_identifier %}
From ce3ea56e6ec33d8a128ddd9a0e41fe8b167d3aec Mon Sep 17 00:00:00 2001 From: Hillel Arnold Date: Tue, 28 Jun 2022 10:52:39 -0400 Subject: [PATCH 4/6] add dates_applicable_display property --- bag_transfer/rights/models.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/bag_transfer/rights/models.py b/bag_transfer/rights/models.py index 9c2f8862..f1d0f046 100644 --- a/bag_transfer/rights/models.py +++ b/bag_transfer/rights/models.py @@ -40,6 +40,20 @@ class RightsStatement(models.Model): def __str__(self): return "{}: {}".format(self.organization, self.rights_basis) + @property + def dates_applicable_display(self): + """Returns a display string of applicable dates for a rights statement. + + Assumes that start and end dates exist on the rights statement, + in other words, assumes it is a rights statement that has been assigned + to a transfer. + """ + date_keys = self.get_date_keys(periods=True) + rights_object = self.rights_info + start_date = getattr(rights_object, date_keys[0]) + end_date = getattr(rights_object, date_keys[2]) if len(date_keys) > 2 else getattr(rights_object, date_keys[1]) + return f"{start_date.strftime('%A, %b %d %Y') if start_date else 'immediately'} - {end_date.strftime('%A, %b %d %Y') if end_date else 'no end date'}" + @property def rights_info(self): """Returns the rights info object associated with a Rights Statement.""" From 8b35ab04836ac7f3a3f6fbddd9b67fdb4deb404c Mon Sep 17 00:00:00 2001 From: Hillel Arnold Date: Tue, 28 Jun 2022 10:52:54 -0400 Subject: [PATCH 5/6] add applicable dates to transfer pages --- bag_transfer/templates/parts/transfer_rights_table.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bag_transfer/templates/parts/transfer_rights_table.html b/bag_transfer/templates/parts/transfer_rights_table.html index 44b64db0..6190a4ee 100644 --- a/bag_transfer/templates/parts/transfer_rights_table.html +++ b/bag_transfer/templates/parts/transfer_rights_table.html @@ -4,6 +4,7 @@ Basis Rights Notes + Dates Applicable @@ -11,6 +12,7 @@ {{statement.rights_basis}} {{statement.rights_info_notes}} + {{statement.dates_applicable_display}} {% endfor %} From f933691c3fb46691f2f1a83201bdf6008db24609 Mon Sep 17 00:00:00 2001 From: Hillel Arnold Date: Tue, 28 Jun 2022 12:17:09 -0400 Subject: [PATCH 6/6] tweak strftime format --- bag_transfer/rights/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bag_transfer/rights/models.py b/bag_transfer/rights/models.py index f1d0f046..feb2dfc2 100644 --- a/bag_transfer/rights/models.py +++ b/bag_transfer/rights/models.py @@ -52,7 +52,7 @@ def dates_applicable_display(self): rights_object = self.rights_info start_date = getattr(rights_object, date_keys[0]) end_date = getattr(rights_object, date_keys[2]) if len(date_keys) > 2 else getattr(rights_object, date_keys[1]) - return f"{start_date.strftime('%A, %b %d %Y') if start_date else 'immediately'} - {end_date.strftime('%A, %b %d %Y') if end_date else 'no end date'}" + return f"{start_date.strftime('%b %d %Y') if start_date else 'immediately'} - {end_date.strftime('%b %d %Y') if end_date else 'no end date'}" @property def rights_info(self):