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

Add letter usage to usage page.

Browse Source 
Still need to add the summary info.
This commit is contained in:
Rebecca Law
2017-12-15 17:28:52 +00:00
parent ef55feba36
commit 43747bd1ea
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -135,12 +135,14 @@ def usage(service_id):
year, current_financial_year = requested_and_current_financial_year(request) year, current_financial_year = requested_and_current_financial_year(request)
free_sms_allowance = billing_api_client.get_free_sms_fragment_limit_for_year(service_id, year) free_sms_allowance = billing_api_client.get_free_sms_fragment_limit_for_year(service_id, year)
units = billing_api_client.get_billable_units(service_id, year)
yearly_usage = billing_api_client.get_service_usage(service_id, year)
return render_template( return render_template(
'views/usage.html', 'views/usage.html',
months=list(get_free_paid_breakdown_for_billable_units( months=list(get_free_paid_breakdown_for_billable_units(
year, year,
free_sms_allowance, free_sms_allowance,
billing_api_client.get_billable_units(service_id, year) units
)), )),
selected_year=year, selected_year=year,
years=get_tuples_of_financial_years( years=get_tuples_of_financial_years(
@@ -148,7 +150,7 @@ def usage(service_id):
start=current_financial_year - 1, start=current_financial_year - 1,
end=current_financial_year + 1, end=current_financial_year + 1,
), ),
**calculate_usage(billing_api_client.get_service_usage(service_id, year), **calculate_usage(yearly_usage,
free_sms_allowance) free_sms_allowance)
) )
@@ -396,18 +398,24 @@ def get_sum_billing_units(billing_units, month=None):
def get_free_paid_breakdown_for_billable_units(year, free_sms_fragment_limit, billing_units): def get_free_paid_breakdown_for_billable_units(year, free_sms_fragment_limit, billing_units):
cumulative = 0 cumulative = 0
letter_cumulative = 0
sms_units = [x for x in billing_units if x['notification_type'] == 'sms']
letter_units = [x for x in billing_units if x['notification_type'] == 'letter']
for month in get_months_for_financial_year(year): for month in get_months_for_financial_year(year):
previous_cumulative = cumulative previous_cumulative = cumulative
monthly_usage = get_sum_billing_units(billing_units, month) monthly_usage = get_sum_billing_units(sms_units, month)
cumulative += monthly_usage cumulative += monthly_usage
breakdown = get_free_paid_breakdown_for_month( breakdown = get_free_paid_breakdown_for_month(
free_sms_fragment_limit, cumulative, previous_cumulative, free_sms_fragment_limit, cumulative, previous_cumulative,
[billing_month for billing_month in billing_units if billing_month['month'] == month] [billing_month for billing_month in sms_units if billing_month['month'] == month]
) )
letter_billing = [(x['billing_units'], x['rate']) for x in letter_units if x['month'] == month]
yield { yield {
'name': month, 'name': month,
# 'total': sms + letter
'paid': breakdown['paid'], 'paid': breakdown['paid'],
'free': breakdown['free'] 'free': breakdown['free'],
'letters': letter_billing
} }

11
app/templates/views/usage.html
View File

@@ -81,7 +81,7 @@
currency="£", currency="£",
smallest=True smallest=True
) }} ) }}
<ul> <ul>
{% if month.free %} {% if month.free %}
<li class="tabular-numbers">{{ "{:,}".format(month.free) }} free text messages</li> <li class="tabular-numbers">{{ "{:,}".format(month.free) }} free text messages</li>
{% endif %} {% endif %}
@@ -93,6 +93,15 @@
<li aria-hidden="true">–</li> <li aria-hidden="true">–</li>
{% endif %} {% endif %}
</ul> </ul>
<ul>
{{ month.letters }}
{% for letter in month.letters%}
{% if letter[0] %}
<li class="tabular-numbers">{{ letter[0]}} letters at {{ ' {:.0f}p'.format(letter[1] * 100) }}
</li>
{% endif %}
{% endfor %}
</ul>
{% endcall %} {% endcall %}
{% endcall %} {% endcall %}
</div> </div>