Merge pull request #399 from sul-dlss/fix-fy

Fix fy
sul-dlss · Apr 20, 2017 · 28d615e · 28d615e
2 parents c45a6fa + d64e347
commit 28d615e
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/app/controllers/endowed_funds_reports_controller.rb b/app/controllers/endowed_funds_reports_controller.rb
@@ -42,7 +42,7 @@ def catalog_keys
 
   def date_start
     if @endowed_funds_report.fiscal_years.any?
-      start_date = Time.zone.parse("#{@endowed_funds_report.fiscal_years[0]}-07-01")
+      start_date = Time.zone.parse("#{@endowed_funds_report.fiscal_years[0]}-09-01") - 1.year
     elsif @endowed_funds_report.calendar_years.any?
       start_date = Time.zone.parse("#{@endowed_funds_report.calendar_years[0]}-01-01")
     elsif @endowed_funds_report.paid_years.any?
@@ -53,8 +53,7 @@ def date_start
 
   def date_end
     if @endowed_funds_report.fiscal_years.any?
-      end_date = Time.zone.parse("#{@endowed_funds_report.fiscal_years[1]}-06-30")
-      end_date += 1.year if @endowed_funds_report.fiscal_years[1] == @endowed_funds_report.fiscal_years[0]
+      end_date = Time.zone.parse("#{@endowed_funds_report.fiscal_years[1]}-08-31")
     elsif @endowed_funds_report.calendar_years.any?
       end_date = Time.zone.parse("#{@endowed_funds_report.calendar_years[1]}-12-31")
     elsif @endowed_funds_report.paid_years.any?