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

Refactor stats into a macro and add format number red on failure

Browse Source
This commit is contained in:
Imdad Ahad
2016-11-14 16:42:08 +00:00
parent eaa246bd26
commit 5ce0cbe1db
2 changed files with 24 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/main/views/user_profile.py
View File

@@ -202,7 +202,7 @@ def user_profile_password():
if form.validate_on_submit():
current_user.set_password(form.new_password.data)
user_api_client.update_user(current_user)
user_api_client.update_user_password(current_user.id, form.new_password.data)
return redirect(url_for('.user_profile'))
return render_template(

58
app/templates/views/platform-admin.html
View File

@@ -2,7 +2,27 @@
{% from "components/big-number.html" import big_number, big_number_with_status %}
{% from "components/message-count-label.html" import message_count_label %}
{% from "components/browse-list.html" import browse_list %}
{% from "components/table.html" import mapping_table, field, row_group, row, right_aligned_field_heading, hidden_field_heading, text_field %}
{% from "components/table.html" import mapping_table, field, stats_fields, row_group, row, right_aligned_field_heading, hidden_field_heading, text_field %}
{% macro stats_fields(channel, data) -%}
{% call field(border=False) %}
<span class="heading-medium">{{ channel.title() }}</span>
{% endcall %}
{% call field(align='right', border=False) %}
{{ big_number(data[channel]['requested'], smaller=True) }}
{% endcall %}
{% call field(align='right', border=False) %}
{{ big_number(data[channel]['delivered'], smaller=True) }}
{% endcall %}
{% call field(align='right', status='error' if data[channel]['failed'], border=False) %}
{{ big_number(data[channel]['failed'], smaller=True) }}
{% endcall %}
{%- endmacro %}
{% macro services_table(services, caption) %}
{% call(item, row_number) mapping_table(
@@ -23,31 +43,14 @@
{% call row_group() %}
{% call row() %}
{% call field(border=False) %}
<a href="{{ url_for('main.service_dashboard', service_id=service['id']) }}" class="browse-list-link">{{ service['name'] }}</a>
{% endcall %}
{% call field(border=False) %}
<span class="heading-medium">Email</span>
{% endcall %}
{% call field(align='right', border=False) %}
{{ big_number(service['stats']['email']['requested'], smaller=True) }}
{% endcall %}
{% call field(align='right', border=False) %}
{{ big_number(service['stats']['email']['delivered'], smaller=True) }}
{% endcall %}
{% call field(align='right', border=False) %}
{{ big_number(service['stats']['email']['failed'], smaller=True) }}
{% endcall %}
{{ stats_fields('email', service['stats']) }}
{% endcall %}
{% call row() %}
{% if service['research_mode'] %}
{% call field(border=False) %}
<span class="research-mode">research mode</span>
@@ -62,22 +65,7 @@
{{ text_field('') }}
{% endif %}
{% call field(border=False) %}
<span class="heading-medium">SMS</span>
{% endcall %}
{% call field(align='right', border=False) %}
{{ big_number(service['stats']['sms']['requested'], smaller=True) }}
{% endcall %}
{% call field(align='right', border=False) %}
{{ big_number(service['stats']['sms']['delivered'], smaller=True) }}
{% endcall %}
{% call field(align='right', border=False) %}
{{ big_number(service['stats']['sms']['failed'], smaller=True) }}
{% endcall %}
{{ stats_fields('sms', service['stats']) }}
{% endcall %}
{% endcall %}