mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-09-09 02:03:11 -04:00
Remove placeholder logs of notifications sent
From the: - dashboard - activity page This info will be confusing for users at the hack day, because it will say they’ve already sent messages when they first sign up. This involved changing the table macro to have a nice ‘no rows’ message.
This commit is contained in:
@@ -41,3 +41,10 @@
|
|||||||
@extend .table-field;
|
@extend .table-field;
|
||||||
text-align: right;
|
text-align: right;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.table-empty-message {
|
||||||
|
@include core-16;
|
||||||
|
color: $secondary-text-colour;
|
||||||
|
border-bottom: 1px solid $border-colour;
|
||||||
|
padding: 5px 0 8px 0;
|
||||||
|
}
|
||||||
|
|||||||
@@ -19,6 +19,6 @@ def service_dashboard(service_id):
|
|||||||
return render_template(
|
return render_template(
|
||||||
'views/service_dashboard.html',
|
'views/service_dashboard.html',
|
||||||
jobs=jobs,
|
jobs=jobs,
|
||||||
free_text_messages_remaining=560,
|
free_text_messages_remaining='25,000',
|
||||||
spent_this_month='0.00',
|
spent_this_month='0.00',
|
||||||
service_id=service_id)
|
service_id=service_id)
|
||||||
|
|||||||
@@ -50,7 +50,7 @@ messages = [
|
|||||||
def view_jobs(service_id):
|
def view_jobs(service_id):
|
||||||
return render_template(
|
return render_template(
|
||||||
'views/jobs.html',
|
'views/jobs.html',
|
||||||
jobs=jobs,
|
jobs=[], # use `jobs` for placeholder data
|
||||||
service_id=service_id
|
service_id=service_id
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -23,20 +23,21 @@
|
|||||||
{%- endmacro %}
|
{%- endmacro %}
|
||||||
|
|
||||||
{% macro list_table(items, caption='', empty_message='', field_headings=[], field_headings_visible=True, caption_visible=True) -%}
|
{% macro list_table(items, caption='', empty_message='', field_headings=[], field_headings_visible=True, caption_visible=True) -%}
|
||||||
{% if items %}
|
|
||||||
{% set parent_caller = caller %}
|
{% set parent_caller = caller %}
|
||||||
{% call mapping_table(caption, field_headings, field_headings_visible, caption_visible) %}
|
{% call mapping_table(caption, field_headings, field_headings_visible, caption_visible) %}
|
||||||
{% for item in items %}
|
{% for item in items %}
|
||||||
{% call row() %}
|
{% call row() %}
|
||||||
{{ parent_caller(item) }}
|
{{ parent_caller(item) }}
|
||||||
{% endcall %}
|
{% endcall %}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
{%- endcall %}
|
{%- endcall %}
|
||||||
{% else %}
|
{% if not items %}
|
||||||
<p class="summary-item-no-content">
|
<p class="table-empty-message">
|
||||||
{{ empty_message }}
|
{{ empty_message }}
|
||||||
</p>
|
</p>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{%- endmacro %}
|
{%- endmacro %}
|
||||||
|
|
||||||
{% macro row() -%}
|
{% macro row() -%}
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ GOV.UK Notify | Notifications activity
|
|||||||
jobs,
|
jobs,
|
||||||
caption="Recent activity",
|
caption="Recent activity",
|
||||||
caption_visible=False,
|
caption_visible=False,
|
||||||
|
empty_message='You haven’t sent any notifications yet',
|
||||||
field_headings=['Job', 'File', 'Time', 'Status']
|
field_headings=['Job', 'File', 'Time', 'Status']
|
||||||
) %}
|
) %}
|
||||||
{% call field() %}
|
{% call field() %}
|
||||||
|
|||||||
@@ -24,9 +24,9 @@
|
|||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
{% call(item) list_table(
|
{% call(item) list_table(
|
||||||
jobs[:3],
|
[],
|
||||||
caption="Recent text messages",
|
caption="Recent text messages",
|
||||||
empty_message="No recent text messages",
|
empty_message='You haven’t sent any text messages yet',
|
||||||
field_headings=['Job', 'File', 'Time', 'Status']
|
field_headings=['Job', 'File', 'Time', 'Status']
|
||||||
) %}
|
) %}
|
||||||
{% call field() %}
|
{% call field() %}
|
||||||
@@ -42,9 +42,5 @@
|
|||||||
{{ item.status }}
|
{{ item.status }}
|
||||||
{% endcall %}
|
{% endcall %}
|
||||||
{% endcall %}
|
{% endcall %}
|
||||||
<p>
|
|
||||||
<a href={{ url_for('.view_jobs', service_id=service_id) }}>See all notifications activity</a>
|
|
||||||
</p>
|
|
||||||
|
|
||||||
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|||||||
@@ -148,6 +148,21 @@
|
|||||||
{% endcall %}
|
{% endcall %}
|
||||||
{% endcall %}
|
{% endcall %}
|
||||||
|
|
||||||
|
{% call(item) list_table(
|
||||||
|
[],
|
||||||
|
caption='Jobs',
|
||||||
|
field_headings=['Job', 'Time'],
|
||||||
|
caption_visible=True,
|
||||||
|
empty_message='You haven’t scheduled any jobs yet'
|
||||||
|
) %}
|
||||||
|
{% call field() %}
|
||||||
|
{{ item.job }}
|
||||||
|
{% endcall %}
|
||||||
|
{% call field() %}
|
||||||
|
{{ item.time }}
|
||||||
|
{% endcall %}
|
||||||
|
{% endcall %}
|
||||||
|
|
||||||
<h2 class="heading-large">Textbox</h2>
|
<h2 class="heading-large">Textbox</h2>
|
||||||
{{ textbox(form.username) }}
|
{{ textbox(form.username) }}
|
||||||
{{ textbox(form.password) }}
|
{{ textbox(form.password) }}
|
||||||
|
|||||||
@@ -13,5 +13,4 @@ def test_should_show_recent_jobs_on_dashboard(app_,
|
|||||||
response = client.get(url_for('main.service_dashboard', service_id=123))
|
response = client.get(url_for('main.service_dashboard', service_id=123))
|
||||||
|
|
||||||
assert response.status_code == 200
|
assert response.status_code == 200
|
||||||
assert 'Test message 1' in response.get_data(as_text=True)
|
assert 'You haven’t sent any text messages yet' in response.get_data(as_text=True)
|
||||||
assert 'Asdfgg' in response.get_data(as_text=True)
|
|
||||||
|
|||||||
@@ -11,8 +11,7 @@ def test_should_return_list_of_all_jobs(app_, db_, db_session, service_one):
|
|||||||
response = client.get(url_for('main.view_jobs', service_id=101))
|
response = client.get(url_for('main.view_jobs', service_id=101))
|
||||||
|
|
||||||
assert response.status_code == 200
|
assert response.status_code == 200
|
||||||
assert 'Test message 1' in response.get_data(as_text=True)
|
assert 'You haven’t sent any notifications yet' in response.get_data(as_text=True)
|
||||||
assert 'Final reminder' in response.get_data(as_text=True)
|
|
||||||
|
|
||||||
|
|
||||||
def test_should_show_page_for_one_job(app_, db_, db_session, service_one):
|
def test_should_show_page_for_one_job(app_, db_, db_session, service_one):
|
||||||
|
|||||||
Reference in New Issue
Block a user