darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-19 14:09:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3831 from alphagov/dont-show-future-financal-year-org-usage

Browse Source 
Don’t show future financial years on organisation usage page
This commit is contained in:
Chris Hill-Scott
2021-03-10 16:49:26 +00:00
committed by GitHub
parent 19488aad97 79bbd0fd98
commit 3d590a71e4
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/main/views/organisations.py
View File

@@ -148,8 +148,8 @@ def organisation_dashboard(org_id):
services=services, services=services,
years=get_tuples_of_financial_years( years=get_tuples_of_financial_years(
partial(url_for, '.organisation_dashboard', org_id=current_organisation.id), partial(url_for, '.organisation_dashboard', org_id=current_organisation.id),
start=current_financial_year - 1, start=current_financial_year - 2,
end=current_financial_year + 1, end=current_financial_year,
), ),
selected_year=year, selected_year=year,
search_form=SearchByNameForm() if len(services) > 7 else None, search_form=SearchByNameForm() if len(services) > 7 else None,

6
tests/app/main/views/organisations/test_organisations.py
View File

@@ -511,9 +511,9 @@ def test_organisation_services_shows_live_services_and_usage_with_count_of_1(
@freeze_time("2020-02-20 20:20") @freeze_time("2020-02-20 20:20")
@pytest.mark.parametrize('financial_year, expected_selected', ( @pytest.mark.parametrize('financial_year, expected_selected', (
(2017, '2017 to 2018 financial year'),
(2018, '2018 to 2019 financial year'), (2018, '2018 to 2019 financial year'),
(2019, '2019 to 2020 financial year'), (2019, '2019 to 2020 financial year'),
(2020, '2020 to 2021 financial year'),
)) ))
def test_organisation_services_filters_by_financial_year( def test_organisation_services_filters_by_financial_year(
client_request, client_request,
@@ -535,9 +535,9 @@ def test_organisation_services_filters_by_financial_year(
) )
mock.assert_called_once_with(ORGANISATION_ID, financial_year) mock.assert_called_once_with(ORGANISATION_ID, financial_year)
assert normalize_spaces(page.select_one('.pill').text) == ( assert normalize_spaces(page.select_one('.pill').text) == (
'2020 to 2021 financial year '
'2019 to 2020 financial year ' '2019 to 2020 financial year '
'2018 to 2019 financial year' '2018 to 2019 financial year '
'2017 to 2018 financial year'
) )
assert normalize_spaces(page.select_one('.pill-item--selected').text) == ( assert normalize_spaces(page.select_one('.pill-item--selected').text) == (
expected_selected expected_selected