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

Make one method for comma-formatting numbers

Browse Source 
We were doing this a few different ways in different places.
This commit is contained in:
Chris Hill-Scott
2019-07-08 14:09:29 +01:00
parent 6d5f542a88
commit 959dd6ac38
4 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/main/views/jobs.py
View File

@@ -25,6 +25,7 @@ from notifications_utils.template import Template, WithSubjectTemplate
from app import (
current_service,
format_datetime_short,
format_thousands,
job_api_client,
notification_api_client,
service_api_client,
@@ -186,8 +187,8 @@ def cancel_letter_job(service_id, job_id):
except HTTPError as e:
flash(e.message, 'dangerous')
return redirect(url_for('main.view_job', service_id=service_id, job_id=job_id))
flash("Cancelled {:,.0f} letters from {}".format(
number_of_letters, job['original_file_name']
flash("Cancelled {} letters from {}".format(
format_thousands(number_of_letters), job['original_file_name']
), 'default_with_tick')
return redirect(url_for('main.service_dashboard', service_id=service_id))

11
app/main/views/service_settings.py
View File

@@ -19,6 +19,7 @@ from app import (
billing_api_client,
current_service,
email_branding_client,
format_thousands,
inbound_number_client,
letter_branding_client,
notification_api_client,
@@ -212,9 +213,9 @@ def submit_request_to_go_live(service_id):
service_dashboard=url_for('main.service_dashboard', service_id=current_service.id, _external=True),
organisation_type=str(current_service.organisation_type).title(),
agreement=current_service.organisation.as_human_readable(current_user.email_domain),
volume_email_formatted=format_if_number(current_service.volume_email),
volume_sms_formatted=format_if_number(current_service.volume_sms),
volume_letter_formatted=format_if_number(current_service.volume_letter),
volume_email_formatted=format_thousands(current_service.volume_email),
volume_sms_formatted=format_thousands(current_service.volume_sms),
volume_letter_formatted=format_thousands(current_service.volume_letter),
research_consent='Yes' if current_service.consent_to_research else 'No',
existing_live='Yes' if current_user.live_services else 'No',
email_address=current_user.email_address,
@@ -1121,7 +1122,3 @@ def check_contact_details_type(contact_details):
return 'email_address'
else:
return 'phone_number'
def format_if_number(value):
return '{:,.0f}'.format(value) if isinstance(value, int) else ''