darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-09 03:43:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add live/trial flag on platform-admin page

Browse Source 
Show 'Live' or 'Trial' under each service to easily identify services
This commit is contained in:
Leo Hemsted
2016-06-21 11:43:54 +01:00
parent a6219ecda2
commit c5f8e1a259
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/main/views/platform_admin.py
View File

@@ -42,7 +42,8 @@ def format_stats_by_service(all_stats, services):
(stats['emails_requested'] - stats['emails_delivered'] - stats['emails_failed']) (stats['emails_requested'] - stats['emails_delivered'] - stats['emails_failed'])
), ),
'delivered': stats['sms_delivered'] + stats['emails_delivered'], 'delivered': stats['sms_delivered'] + stats['emails_delivered'],
'failed': stats['sms_failed'] + stats['emails_failed'] 'failed': stats['sms_failed'] + stats['emails_failed'],
'restricted': services[stats['service']]['restricted']
} }
for stats in all_stats for stats in all_stats
] ]

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

@@ -60,6 +60,9 @@
{% call field() %} {% call field() %}
<div> <div>
<a href="{{ url_for('main.service_dashboard', service_id=item['id']) }}" class="browse-list-link">{{ item['name'] }}</a> <a href="{{ url_for('main.service_dashboard', service_id=item['id']) }}" class="browse-list-link">{{ item['name'] }}</a>
<span class="file-list-hint">
{{ 'Trial' if item['restricted'] else 'Live' }}
</span>
</div> </div>
{% endcall %} {% endcall %}
{% call field(align='right') %} {% call field(align='right') %}

8
tests/app/main/views/test_platform_admin.py
View File

@@ -87,8 +87,8 @@ def create_stats(
def test_format_stats_by_service_gets_correct_stats_for_each_service(): def test_format_stats_by_service_gets_correct_stats_for_each_service():
services = [ services = [
{'name': 'a', 'id': 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa'}, {'name': 'a', 'id': 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', 'restricted': False},
{'name': 'b', 'id': 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb'} {'name': 'b', 'id': 'bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb', 'restricted': True}
] ]
all_stats = [ all_stats = [
create_stats('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', emails_requested=1), create_stats('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', emails_requested=1),
@@ -102,16 +102,18 @@ def test_format_stats_by_service_gets_correct_stats_for_each_service():
assert ret[0]['sending'] == 1 assert ret[0]['sending'] == 1
assert ret[0]['delivered'] == 0 assert ret[0]['delivered'] == 0
assert ret[0]['failed'] == 0 assert ret[0]['failed'] == 0
assert ret[0]['restricted'] is False
assert ret[1]['name'] == 'b' assert ret[1]['name'] == 'b'
assert ret[1]['sending'] == 2 assert ret[1]['sending'] == 2
assert ret[1]['delivered'] == 0 assert ret[1]['delivered'] == 0
assert ret[1]['failed'] == 0 assert ret[1]['failed'] == 0
assert ret[1]['restricted'] is True
def test_format_stats_by_service_sums_values_for_sending(): def test_format_stats_by_service_sums_values_for_sending():
services = [ services = [
{'name': 'a', 'id': 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa'}, {'name': 'a', 'id': 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', 'restricted': False},
] ]
all_stats = [ all_stats = [
create_stats( create_stats(