From ab9ea99ccc0fed3703eacd84bc3080191752f741 Mon Sep 17 00:00:00 2001 From: Steve Majewski Date: Wed, 3 Apr 2019 16:56:35 -0400 Subject: [PATCH] extend accession_report and resources_list_report to include collection_management_subreport --- reports/accessions/accession_report/accession_report.rb | 6 ++++++ reports/accessions/accession_report/en.yml | 2 ++ reports/custom/en.yml | 8 ++++++++ reports/resources/resources_list_report/en.yml | 1 + .../resources_list_report/resources_list_report.rb | 1 + 5 files changed, 18 insertions(+) diff --git a/reports/accessions/accession_report/accession_report.rb b/reports/accessions/accession_report/accession_report.rb index b6b1e99156..55a106ff7c 100644 --- a/reports/accessions/accession_report/accession_report.rb +++ b/reports/accessions/accession_report/accession_report.rb @@ -108,10 +108,16 @@ def add_sub_reports(row) row[:locations] = AccessionLocationsSubreport.new(self, id).get_content row[:names] = AccessionNamesSubreport.new(self, id).get_content row[:subjects] = AccessionSubjectsSubreport.new(self, id).get_content + row[:collection_management] = CollectionManagementSubreport.new( self, id).get_content row.delete(:accession_id) end def identifier_field :accession_number end + + def record_type + 'accession' + end + end diff --git a/reports/accessions/accession_report/en.yml b/reports/accessions/accession_report/en.yml index 5142fe1ff9..d6f466ba51 100644 --- a/reports/accessions/accession_report/en.yml +++ b/reports/accessions/accession_report/en.yml @@ -4,3 +4,5 @@ en: title: Accession Report description: Displays all accessions for a given repository. Report includes data entered into basic information fields for each accession. identifier_prefix: Accession + collection_management: Collection Management + diff --git a/reports/custom/en.yml b/reports/custom/en.yml index bf3b7cdd56..d75865fec2 100644 --- a/reports/custom/en.yml +++ b/reports/custom/en.yml @@ -3,3 +3,11 @@ en: custom_report: title: Custom Report description: Create a custom report by choosing record type, fields, and linked record types. + collection_management_subreport: + processing_funding_source: Funding Source + processing_hours_total: Total Hours + processing_plan: Processing Plan + processing_priority: Processing Priority + processing_status: Processing Status + processors: Processors + rights_determined: Rights Determined? \ No newline at end of file diff --git a/reports/resources/resources_list_report/en.yml b/reports/resources/resources_list_report/en.yml index ab82fa6e86..71dc1d2a69 100644 --- a/reports/resources/resources_list_report/en.yml +++ b/reports/resources/resources_list_report/en.yml @@ -3,3 +3,4 @@ en: resources_list_report: title: Resources List Report description: The Resources List Report includes basic information, dates, and extents for resource records. + collection_management: Collection Management diff --git a/reports/resources/resources_list_report/resources_list_report.rb b/reports/resources/resources_list_report/resources_list_report.rb index dfd2583626..c58e67434b 100644 --- a/reports/resources/resources_list_report/resources_list_report.rb +++ b/reports/resources/resources_list_report/resources_list_report.rb @@ -21,6 +21,7 @@ def fix_row(row) ReportUtils.fix_identifier_format(row) row[:date] = ResourcesListDatesSubreport.new(self, row[:id]).get_content row[:extent] = ExtentSubreport.new(self, row[:id]).get_content + row[:collection_management] = CollectionManagementSubreport.new( self, row[:id] ).get_content row.delete(:id) end