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

Merge pull request #3166 from alphagov/usage-back-on-dashboard

Browse Source 
Put usage summary back on the dashboard
This commit is contained in:
Chris Hill-Scott
2019-11-07 10:32:51 +00:00
committed by GitHub
parent 4ca4cef1b3 889d601475
commit b671ad239d
6 changed files with 91 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/main/views/dashboard.py
View File

@@ -299,7 +299,14 @@ def get_dashboard_partials(service_id):
)
for key, value in dashboard_totals[0].items()
)
free_sms_allowance = billing_api_client.get_free_sms_fragment_limit_for_year(
current_service.id,
get_current_financial_year(),
)
yearly_usage = billing_api_client.get_service_usage(
service_id,
get_current_financial_year(),
)
return {
'upcoming': render_template(
'views/dashboard/_upcoming.html',
@@ -332,7 +339,12 @@ def get_dashboard_partials(service_id):
'views/dashboard/_jobs.html',
jobs=immediate_jobs
),
'has_jobs': bool(immediate_jobs)
'has_jobs': bool(immediate_jobs),
'usage': render_template(
'views/dashboard/_usage.html',
column_width=column_width,
**calculate_usage(yearly_usage, free_sms_allowance),
),
}