diff --git a/app/assets/stylesheets/components/table.scss b/app/assets/stylesheets/components/table.scss index c748bdbcc..f5cb285c0 100644 --- a/app/assets/stylesheets/components/table.scss +++ b/app/assets/stylesheets/components/table.scss @@ -118,6 +118,10 @@ } + &-noborder { + border: 0px; + } + &-index { width: 15px; } @@ -159,6 +163,12 @@ text-align: right; } + +.table-row-group { + border-top: 1px solid #BFC1C3; + border-bottom: 1px solid #BFC1C3; +} + .table-empty-message { @include core-16; color: $secondary-text-colour; diff --git a/app/templates/components/table.html b/app/templates/components/table.html index 97783ff93..02dcfadd0 100644 --- a/app/templates/components/table.html +++ b/app/templates/components/table.html @@ -49,10 +49,20 @@ {%- endmacro %} -{% macro field(align='left', status='') -%} - - {{ caller() }} - +{% macro row_group(id=None) %} + + {{ caller() }} + +{%- endmacro %} + +{% macro field(align='left', status='', border=True) -%} + + {% set field_alignment = 'table-field-right-aligned' if align == 'right' else 'table-field-center-aligned' %} + {% set border = '' if border else 'table-field-noborder' %} + + + {{ caller() }} + {%- endmacro %} {% macro row_heading() -%} diff --git a/app/templates/views/platform-admin.html b/app/templates/views/platform-admin.html index 38902bc7d..a79f35886 100644 --- a/app/templates/views/platform-admin.html +++ b/app/templates/views/platform-admin.html @@ -2,49 +2,88 @@ {% 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 list_table, field, right_aligned_field_heading, hidden_field_heading, text_field %} +{% from "components/table.html" import mapping_table, field, row_group, row, right_aligned_field_heading, hidden_field_heading, text_field %} {% macro services_table(services, caption) %} - {% call(item, row_number) list_table( - services, + {% call(item, row_number) mapping_table( caption=caption, caption_visible=True, field_headings=[ - 'Service', - hidden_field_heading('Status'), - right_aligned_field_heading('Sending'), - right_aligned_field_heading('Delivered'), - right_aligned_field_heading('Failed') + 'Service', + hidden_field_heading('Type'), + right_aligned_field_heading('Sending'), + right_aligned_field_heading('Delivered'), + right_aligned_field_heading('Failed') ], field_headings_visible=True ) %} - {% call field() %} -
- {{ item['name'] }} -
- {% endcall %} - {% if item['research_mode'] %} - {% call field() %} - research mode + + {% for service in services %} + + {% call row_group() %} + + {% call row() %} + + {% call field(border=False) %} + {{ service['name'] }} + {% endcall %} + + {% call field(border=False) %} + Email + {% 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 %} + + {% endcall %} + + {% call row() %} + + {% if service['research_mode'] %} + {% call field(border=False) %} + research mode + {% endcall %} + {% elif not service['restricted'] %} + {% call field(status='error') %} + + Live + + {% endcall %} + {% else %} + {{ text_field('') }} + {% endif %} + + {% call field(border=False) %} + SMS + {% 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 %} + + {% endcall %} + {% endcall %} - {% elif not item['restricted'] %} - {% call field(status='error') %} - - Live - - {% endcall %} - {% else %} - {{ text_field('') }} - {% endif %} - {% call field(align='right') %} - {{ big_number(item['sending'], smaller=True) }} - {% endcall %} - {% call field(align='right') %} - {{ big_number(item['delivered'], smaller=True) }} - {% endcall %} - {% call field(align='right', status='error' if 0 else '') %} - {{ big_number(item['failed'], smaller=True) }} - {% endcall %} + + {% endfor %} + {% endcall %} {% endmacro %}