diff --git a/app/templates/views/dashboard/_jobs.html b/app/templates/views/dashboard/_jobs.html index a2ca98d0a..3a7d93a80 100644 --- a/app/templates/views/dashboard/_jobs.html +++ b/app/templates/views/dashboard/_jobs.html @@ -63,22 +63,12 @@ {% if link %} {% endif %} - - - {% if item.notifications_sending is number %} - {% if currency %} - {{ "{}{:,.2f}".format(currency, item.notifications_sending) }} - {% else %} - {{ "{:,}".format(item.notifications_sending) }} - {% endif %} - {% else %} - {{ item.notifications_sending }} - {% endif %} - - {% if item.notifications_sending %} - {{ item.notifications_sending }} - {% endif %} + + + {{ "{:,}".format(item.notifications_sending) }} + pending + {% if link %} {% endif %} diff --git a/app/templates/views/platform-admin/_global_stats.html b/app/templates/views/platform-admin/_global_stats.html index 0ff1f6a79..aaf9b41ef 100644 --- a/app/templates/views/platform-admin/_global_stats.html +++ b/app/templates/views/platform-admin/_global_stats.html @@ -1,48 +1,64 @@ -{% from "components/big-number.html" import big_number %} -
- {{ 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 show_failures %} - - {% if global_stats.email.failed %} - {% if failure_link %} - - {{ "{:,}".format(global_stats.email.failed) }} - failed – {{ global_stats.email.failure_rate }}% - - {% else %} + {% if link %} + + {% endif %} + + + {{ "{:,}".format(global_stats.email.delivered + global_stats.email.failed) }} + + {{ global_stats.email.delivered|message_count_label('email') }} + + {% if link %} + + {% endif %} + + {% if global_stats.email.failed %} + {% if failure_link %} + {{ "{:,}".format(global_stats.email.failed) }} failed – {{ global_stats.email.failure_rate }}% - {% endif %} + {% else %} - No failures + {{ "{:,}".format(global_stats.email.failed) }} + failed – {{ global_stats.email.failure_rate }}% {% endif %} - - {% endif %} + {% else %} + No failures + {% endif %} +
- {{ 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 show_failures %} - - {% if global_stats.sms.failed %} - {% if failure_link %} - - {{ "{:,}".format(global_stats.sms.failed) }} - failed – {{ global_stats.sms.failure_rate }}% - - {% else %} + {% if link %} + + {% endif %} + + + {{ "{:,}".format( global_stats.sms.delivered + global_stats.sms.failed ) }} + + {{ global_stats.sms.delivered|message_count_label('sms') }} + + {% if link %} + + {% endif %} + + {% if global_stats.sms.failed %} + {% if failure_link %} + {{ "{:,}".format(global_stats.sms.failed) }} failed – {{ global_stats.sms.failure_rate }}% - {% endif %} + {% else %} - No failures + {{ "{:,}".format(global_stats.sms.failed) }} + failed – {{ global_stats.sms.failure_rate }}% {% endif %} - - {% endif %} + {% else %} + No failures + {% endif %} +
diff --git a/app/templates/views/platform-admin/index.html b/app/templates/views/platform-admin/index.html index 5ba96dc4b..a90da7224 100644 --- a/app/templates/views/platform-admin/index.html +++ b/app/templates/views/platform-admin/index.html @@ -34,17 +34,11 @@
- {% if noti_type.black_box.number is number %} {{ "{:,}".format(noti_type.black_box.number) }} - {% else %} - {{ noti_type.black_box.number }} - {% endif %} - {% if 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) }} - {% endif %} {% for item in noti_type.other_data %}