small fixes to get things in correct places

This commit is contained in:
stvnrlly
2023-12-18 12:32:14 -05:00
parent 23d3ae6951
commit 6926be6208
3 changed files with 51 additions and 51 deletions

View File

@@ -63,22 +63,12 @@
{% if link %} {% if link %}
<a class="usa-link display-flex" href="{{ link }}"> <a class="usa-link display-flex" href="{{ link }}">
{% endif %} {% endif %}
<span class="big-number-smallest"> <span class="big-number-smallest">
<span class="big-number-number"> <span class="big-number-number">
{% if item.notifications_sending is number %} {{ "{:,}".format(item.notifications_sending) }}
{% if currency %}
{{ "{}{:,.2f}".format(currency, item.notifications_sending) }}
{% else %}
{{ "{:,}".format(item.notifications_sending) }}
{% endif %}
{% else %}
{{ item.notifications_sending }}
{% endif %}
</span>
{% if item.notifications_sending %}
<span class="big-number-label">{{ item.notifications_sending }}</span>
{% endif %}
</span> </span>
<span class="big-number-label">pending</span>
</span>
{% if link %} {% if link %}
</a> </a>
{% endif %} {% endif %}

View File

@@ -1,48 +1,64 @@
{% from "components/big-number.html" import big_number %}
<div class="grid-row bottom-gutter"> <div class="grid-row bottom-gutter">
<div class="grid-col-6"> <div class="grid-col-6">
<span class="big-number-with-status"> <span class="big-number-with-status">
{{ big_number({{ global_stats.email.delivered + global_stats.email.failed }}, {{global_stats.email.delivered|message_count_label('email')}}, link=link, smaller=True, smallest=False) }} {% if link %}
{% if show_failures %} <a class="usa-link display-flex" href="{{ link }}">
<span class="big-number-status{% if (global_stats.email.failure_rate|float > 3) is sameas true %} big-number-status--failing{% endif %}"> {% endif %}
{% if global_stats.email.failed %} <span class="big-number-smaller">
{% if failure_link %} <span class="big-number-number">
<a class="usa-link" href="{{ failure_link }}"> {{ "{:,}".format(global_stats.email.delivered + global_stats.email.failed) }}
{{ "{:,}".format(global_stats.email.failed) }} </span>
failed {{ global_stats.email.failure_rate }}% <span class="big-number-label">{{ global_stats.email.delivered|message_count_label('email') }}</span>
</a> </span>
{% else %} {% if link %}
</a>
{% endif %}
<span class="big-number-status{% if (global_stats.email.failure_rate|float > 3) is sameas true %} big-number-status--failing{% endif %}">
{% if global_stats.email.failed %}
{% if failure_link %}
<a class="usa-link" href="{{ failure_link }}">
{{ "{:,}".format(global_stats.email.failed) }} {{ "{:,}".format(global_stats.email.failed) }}
failed {{ global_stats.email.failure_rate }}% failed {{ global_stats.email.failure_rate }}%
{% endif %} </a>
{% else %} {% else %}
No failures {{ "{:,}".format(global_stats.email.failed) }}
failed {{ global_stats.email.failure_rate }}%
{% endif %} {% endif %}
</span> {% else %}
{% endif %} No failures
{% endif %}
</span>
</span> </span>
</div> </div>
<div class="grid-col-6"> <div class="grid-col-6">
<span class="big-number-with-status"> <span class="big-number-with-status">
{{ big_number({{global_stats.sms.delivered + global_stats.sms.failed}}, {{global_stats.sms.delivered|message_count_label('sms')}}, link=link, smaller=True, smallest=False) }} {% if link %}
{% if show_failures %} <a class="usa-link display-flex" href="{{ link }}">
<span class="big-number-status{% if (global_stats.sms.failure_rate|float > 3) is sameas true %} big-number-status--failing{% endif %}"> {% endif %}
{% if global_stats.sms.failed %} <span class="big-number-smaller">
{% if failure_link %} <span class="big-number-number">
<a class="usa-link" href="{{ failure_link }}"> {{ "{:,}".format( global_stats.sms.delivered + global_stats.sms.failed ) }}
{{ "{:,}".format(global_stats.sms.failed) }} </span>
failed {{ global_stats.sms.failure_rate }}% <span class="big-number-label">{{ global_stats.sms.delivered|message_count_label('sms') }}</span>
</a> </span>
{% else %} {% if link %}
</a>
{% endif %}
<span class="big-number-status{% if (global_stats.sms.failure_rate|float > 3) is sameas true %} big-number-status--failing{% endif %}">
{% if global_stats.sms.failed %}
{% if failure_link %}
<a class="usa-link" href="{{ failure_link }}">
{{ "{:,}".format(global_stats.sms.failed) }} {{ "{:,}".format(global_stats.sms.failed) }}
failed {{ global_stats.sms.failure_rate }}% failed {{ global_stats.sms.failure_rate }}%
{% endif %} </a>
{% else %} {% else %}
No failures {{ "{:,}".format(global_stats.sms.failed) }}
failed {{ global_stats.sms.failure_rate }}%
{% endif %} {% endif %}
</span> {% else %}
{% endif %} No failures
{% endif %}
</span>
</span> </span>
</div> </div>
</div> </div>

View File

@@ -34,17 +34,11 @@
<div class="grid-col-6"> <div class="grid-col-6">
<span class="big-number-dark bottom-gutter-2-3"> <span class="big-number-dark bottom-gutter-2-3">
<span class="big-number-number"> <span class="big-number-number">
{% if noti_type.black_box.number is number %}
{{ "{:,}".format(noti_type.black_box.number) }} {{ "{:,}".format(noti_type.black_box.number) }}
{% else %}
{{ noti_type.black_box.number }}
{% endif %}
</span> </span>
{% if noti_type.black_box.number|message_count_label(noti_type.black_box.notification_type) %}
<span class="big-number-label"> <span class="big-number-label">
{{ noti_type.black_box.number|message_count_label(noti_type.black_box.notification_type) }} {{ noti_type.black_box.number|message_count_label(noti_type.black_box.notification_type) }}
</span> </span>
{% endif %}
</span> </span>
{% for item in noti_type.other_data %} {% for item in noti_type.other_data %}