From ba535523dfdecfb104c025cddcf188b74116bc42 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Wed, 14 Oct 2020 14:05:14 +0100
Subject: [PATCH] Move end time to bottom of page

End time is less important than the status of the broadcast, or when it
was started (eg when it was received by most people in the area).
---
 .../broadcast/partials/dashboard-table.html   |  6 +--
 .../views/broadcast/view-message.html         | 43 +++++++++++--------
 tests/app/main/views/test_broadcast.py        | 24 +++++------
 3 files changed, 39 insertions(+), 34 deletions(-)

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 @@
         <p class="govuk-body govuk-!-margin-top-6 govuk-!-margin-bottom-0 live-broadcast">
           Live until {{ item.finishes_at|format_datetime_relative }}
         </p>
-      {% elif item.status == 'cancelled' %}
-        <p class="govuk-body govuk-!-margin-top-6 govuk-!-margin-bottom-0 govuk-hint">
-          Stopped {{ item.cancelled_at|format_datetime_relative }}
-        </p>
       {% else %}
         <p class="govuk-body govuk-!-margin-top-6 govuk-!-margin-bottom-0 govuk-hint">
-          Finished {{ item.finishes_at|format_datetime_relative }}
+          Broadcast {{ item.starts_at|format_datetime_relative }}
         </p>
       {% 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) }}
 
-    <p class="govuk-body govuk-!-margin-bottom-3">
-      Started broadcasting
-      {{ broadcast_message.starts_at|format_datetime_human }}.
-    </p>
-
-    <p class="govuk-body">
-      {% 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' %}
+      <p class="govuk-body">
         Live until {{ broadcast_message.finishes_at|format_datetime_relative }}&ensp;
         {%- if not hide_stop_link %}
-          <a href="{{ url_for('.cancel_broadcast_message', service_id=current_service.id, broadcast_message_id=broadcast_message.id) }}" class="destructive-link destructive-link--no-visited-state">Stop broadcast early</a>
+          <a href="{{ url_for('.cancel_broadcast_message', service_id=current_service.id, broadcast_message_id=broadcast_message.id) }}" class="destructive-link destructive-link--no-visited-state">Stop broadcasting</a>
         {% 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 %}
-    </p>
+      </p>
+    {% else %}
+      <p class="govuk-body govuk-!-margin-bottom-4">
+        Broadcast
+        {{ broadcast_message.starts_at|format_datetime_human }}.
+      </p>
+    {% endif %}
+
   {% endif %}
 
   {{ broadcast_message.template|string }}
@@ -149,4 +143,19 @@
     </p>
   {% endif %}
 
+  {% if broadcast_message.status == 'broadcasting' %}
+    <p class="govuk-body">
+      Broadcasting stops {{ broadcast_message.finishes_at|format_datetime_human }}.
+    </p>
+  {% elif broadcast_message.status == 'cancelled' %}
+    <p class="govuk-body">
+      Stopped by {{ broadcast_message.cancelled_by.name }}
+      {{ broadcast_message.cancelled_at|format_datetime_human }}.
+    </p>
+  {% elif broadcast_message.status == 'completed' %}
+    <p class="govuk-body">
+      Finished broadcasting {{ broadcast_message.finishes_at|format_datetime_human }}.
+    </p>
+  {% 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')