From 4d8044bf3324bc06b096ff115ba5d6a8a803962d Mon Sep 17 00:00:00 2001 From: stvnrlly Date: Sun, 17 Dec 2023 16:27:26 -0500 Subject: [PATCH] remove big_number from _totals.html and monthly.html --- app/templates/views/dashboard/_totals.html | 15 ++++++++++++--- app/templates/views/dashboard/monthly.html | 16 ++++++++++------ .../views/dashboard/template-statistics.html | 2 -- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/app/templates/views/dashboard/_totals.html b/app/templates/views/dashboard/_totals.html index 2f96d743f..20c1d3a81 100644 --- a/app/templates/views/dashboard/_totals.html +++ b/app/templates/views/dashboard/_totals.html @@ -1,10 +1,19 @@ -{% from "components/big-number.html" import big_number %} -
- {{ big_number(statistics['sms']['requested'], statistics['sms']['requested']|message_count_label('sms', suffix='sent'), link=url_for('.view_notifications', service_id=service_id, message_type='sms', status='sending,delivered,failed'), smaller=True, smallest=smallest) }} + + + + {% if statistics['sms']['requested'] is number %} + {{ "{:,}".format(statistics['sms']['requested']) }} + {% else %} + {{ statistics['sms']['requested'] }} + {% endif %} + + {{ statistics['sms']['requested']|message_count_label('sms', suffix='sent') }} + + {% if show_failures %} {% if statistics['sms']['failed'] %} diff --git a/app/templates/views/dashboard/monthly.html b/app/templates/views/dashboard/monthly.html index 74afe875d..4a207f9f5 100644 --- a/app/templates/views/dashboard/monthly.html +++ b/app/templates/views/dashboard/monthly.html @@ -1,5 +1,4 @@ {% from "components/page-header.html" import page_header %} -{% from "components/big-number.html" import big_number %} {% from "components/pill.html" import pill %} {% from "components/table.html" import list_table, field, hidden_field_heading, right_aligned_field_heading, row_heading %} @@ -44,11 +43,16 @@ (month.email_counts, 'email'), ] %} {% call field(align='left') %} - {{ big_number( - counts.requested, - counts.requested|message_count_label(template_type, suffix=''), - smallest=True, - ) }} + + + {% if counts.requested is number %} + {{ "{:,}".format(counts.requested) }} + {% else %} + {{ counts.requested }} + {% endif %} + + {{ counts.requested|message_count_label(template_type, suffix='') }} + {% if counts.requested %} {{ "{:,}".format(counts.failed) }} failed diff --git a/app/templates/views/dashboard/template-statistics.html b/app/templates/views/dashboard/template-statistics.html index 45df69980..5437dd3a5 100644 --- a/app/templates/views/dashboard/template-statistics.html +++ b/app/templates/views/dashboard/template-statistics.html @@ -1,5 +1,3 @@ -{% from "components/big-number.html" import big_number %} -{% from "components/big-number.html" import big_number %} {% from "components/table.html" import list_table, field, right_aligned_field_heading, row_heading, spark_bar_field %} {% from "components/show-more.html" import show_more %}