diff --git a/app/templates/views/broadcast/partials/dashboard-table.html b/app/templates/views/broadcast/partials/dashboard-table.html index 1e1e559f1..09218af1f 100644 --- a/app/templates/views/broadcast/partials/dashboard-table.html +++ b/app/templates/views/broadcast/partials/dashboard-table.html @@ -34,13 +34,9 @@

Live until {{ item.finishes_at|format_datetime_relative }}

- {% elif item.status == 'cancelled' %} -

- Stopped {{ item.cancelled_at|format_datetime_relative }} -

{% else %}

- Finished {{ item.finishes_at|format_datetime_relative }} + Broadcast {{ item.starts_at|format_datetime_relative }}

{% endif %} {% endcall %} diff --git a/app/templates/views/broadcast/view-message.html b/app/templates/views/broadcast/view-message.html index 5133839aa..59af6615b 100644 --- a/app/templates/views/broadcast/view-message.html +++ b/app/templates/views/broadcast/view-message.html @@ -99,26 +99,20 @@ {% else %} {{ page_header(broadcast_message.template_name) }} -

- Started broadcasting - {{ broadcast_message.starts_at|format_datetime_human }}. -

- -

- {% if broadcast_message.status == 'pending-approval' %} - Will broadcast until {{ broadcast_message.finishes_at|format_datetime_relative }}. - {% elif broadcast_message.status == 'broadcasting' %} + {% if broadcast_message.status == 'broadcasting' %} +

Live until {{ broadcast_message.finishes_at|format_datetime_relative }}  {%- if not hide_stop_link %} - Stop broadcast early + Stop broadcasting {% endif %} - {% elif broadcast_message.status == 'cancelled' %} - Stopped by {{ broadcast_message.cancelled_by.name }} - {{ broadcast_message.cancelled_at|format_datetime_human }}. - {% else %} - Finished broadcasting {{ broadcast_message.finishes_at|format_datetime_human }}. - {% endif %} -

+

+ {% else %} +

+ Broadcast + {{ broadcast_message.starts_at|format_datetime_human }}. +

+ {% endif %} + {% endif %} {{ broadcast_message.template|string }} @@ -149,4 +143,19 @@

{% endif %} + {% if broadcast_message.status == 'broadcasting' %} +

+ Broadcasting stops {{ broadcast_message.finishes_at|format_datetime_human }}. +

+ {% elif broadcast_message.status == 'cancelled' %} +

+ Stopped by {{ broadcast_message.cancelled_by.name }} + {{ broadcast_message.cancelled_at|format_datetime_human }}. +

+ {% elif broadcast_message.status == 'completed' %} +

+ Finished broadcasting {{ broadcast_message.finishes_at|format_datetime_human }}. +

+ {% endif %} + {% endblock %} diff --git a/tests/app/main/views/test_broadcast.py b/tests/app/main/views/test_broadcast.py index 3693abeb2..4be2e2a1f 100644 --- a/tests/app/main/views/test_broadcast.py +++ b/tests/app/main/views/test_broadcast.py @@ -361,8 +361,8 @@ def test_previous_broadcasts_page( assert [ normalize_spaces(row.text) for row in page.select('table')[0].select('tbody tr') ] == [ - 'Example template This is a test England Scotland Stopped 10 February at 2:20am', - 'Example template This is a test England Scotland Finished yesterday at 8:20pm', + 'Example template This is a test England Scotland Broadcast yesterday at 2:20am', + 'Example template This is a test England Scotland Broadcast yesterday at 2:20pm', ] @@ -1037,34 +1037,34 @@ def test_start_broadcasting( 'status': 'broadcasting', 'finishes_at': '2020-02-23T23:23:23.000000', }, [ - 'Started broadcasting on 20 February at 8:20pm.', - 'Live until tomorrow at 11:23pm Stop broadcast early', + 'Live until tomorrow at 11:23pm Stop broadcasting', 'Prepared by Alice and approved by Bob.', + 'Broadcasting stops tomorrow at 11:23pm.' ]), ({ 'status': 'broadcasting', 'finishes_at': '2020-02-22T22:20:20.000000', # 2 mins before now() }, [ - 'Started broadcasting on 20 February at 8:20pm.', - 'Finished broadcasting today at 10:20pm.', + 'Broadcast on 20 February at 8:20pm.', 'Prepared by Alice and approved by Bob.', + 'Finished broadcasting today at 10:20pm.' ]), ({ - 'status': 'finished', + 'status': 'completed', 'finishes_at': '2020-02-21T21:21:21.000000', }, [ - 'Started broadcasting on 20 February at 8:20pm.', - 'Finished broadcasting yesterday at 9:21pm.', + 'Broadcast on 20 February at 8:20pm.', 'Prepared by Alice and approved by Bob.', + 'Finished broadcasting yesterday at 9:21pm.', ]), ({ 'status': 'cancelled', 'cancelled_by_id': sample_uuid, 'cancelled_at': '2020-02-21T21:21:21.000000', }, [ - 'Started broadcasting on 20 February at 8:20pm.', - 'Stopped by Alice yesterday at 9:21pm.', - 'Prepared by Bob and approved by Carol.', + 'Broadcast on 20 February at 8:20pm.', + 'Prepared by Alice and approved by Bob.', + 'Stopped by Carol yesterday at 9:21pm.', ]), )) @freeze_time('2020-02-22T22:22:22.000000')