Skip to content

Fiscal Year Start Date Calculations with Calendar Service #9451

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
olatifflexion merged 2 commits into from
Oct 25, 2023
Merged

Fiscal Year Start Date Calculations with Calendar Service #9451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b8e077
Fiscal Year Start Date Calculations with Calendar Service
olatifflexion Oct 25, 2023
78b04e1
feedback
olatifflexion Oct 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions app/jobs/reports/base_report.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,6 @@ def public_bucket_name
end
end

def fiscal_start_date(time = Time.zone.now.beginning_of_day)
time.change(year: time.month >= 10 ? time.year : time.year - 1, month: 10, day: 1)
end

def first_of_this_month
Time.zone.now.beginning_of_month
end
Expand Down
6 changes: 5 additions & 1 deletion app/jobs/reports/sp_active_users_report.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,12 @@ def finish_time(time)
end
end

def fiscal_start_date(time = Time.zone.now.beginning_of_day)
CalendarService.fiscal_start_date(time)
end

def fiscal_end_date(time)
time.change(year: time.month >= 10 ? time.year + 1 : time.year, month: 9, day: 30).end_of_day
CalendarService.fiscal_end_date(time).end_of_day
end

def reporting_range(time)
Expand Down