darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-07-16 19:30:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Limit big numbers to the last 7 days

Browse Source 
Implements and depends on:
- https://github.com/alphagov/notifications-api/pull/241
This commit is contained in:
Chris Hill-Scott
2016-04-19 17:02:49 +01:00
parent 5bf0d8fe70
commit be7c7cebbc
4 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,7 +38,7 @@ def service_dashboard(service_id):
return render_template(
'views/dashboard/dashboard.html',
statistics=add_rates_to(
statistics_api_client.get_statistics_for_service(service_id)['data']
statistics_api_client.get_statistics_for_service(service_id, limit_days=7)['data']
),
templates=service_api_client.get_service_templates(service_id)['data'],
template_statistics=aggregate_usage(
@@ -50,15 +50,11 @@ def service_dashboard(service_id):
@main.route("/services/<service_id>/dashboard.json")
@login_required
def service_dashboard_updates(service_id):
statistics = statistics_api_client.get_statistics_for_service(service_id)['data']
template_statistics = aggregate_usage(template_statistics_client.get_template_statistics_for_service(service_id))
return jsonify(**{
'today': render_template(
'views/dashboard/today.html',
statistics=add_rates_to(
statistics_api_client.get_statistics_for_service(service_id)['data']
statistics_api_client.get_statistics_for_service(service_id, limit_days=7)['data']
),
template_statistics=aggregate_usage(
template_statistics_client.get_template_statistics_for_service(service_id)

5
app/notify_client/statistics_api_client.py
View File

@@ -12,7 +12,10 @@ class StatisticsApiClient(BaseAPIClient):
self.client_id = app.config['ADMIN_CLIENT_USER_NAME']
self.secret = app.config['ADMIN_CLIENT_SECRET']
def get_statistics_for_service(self, service_id):
def get_statistics_for_service(self, service_id, limit_days=None):
params = {}
if limit_days is not None:
params['limit_days'] = limit_days
return self.get(
url='/service/{}/notifications-statistics'.format(service_id),
)