From 2e8e650733755ea8d32024ba955208afc355fd00 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Thu, 9 Jun 2016 10:25:52 +0100
Subject: [PATCH] Put same info in both tables of notifications
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We have tables listing notifications on:
- the job page
- the ‘activity’ page

Previously that had subtly different information, in a different order.
This commit makes them exactly the same.
---
 app/assets/stylesheets/components/table.scss   |  1 +
 app/templates/partials/jobs/notifications.html | 15 ++++++++++-----
 tests/app/main/views/test_jobs.py              |  6 ++++--
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/app/assets/stylesheets/components/table.scss b/app/assets/stylesheets/components/table.scss
index 7e6f0c8f8..45a86e33e 100644
--- a/app/assets/stylesheets/components/table.scss
+++ b/app/assets/stylesheets/components/table.scss
@@ -17,6 +17,7 @@
 .table-row {
   th {
     width: 52.5%;
+    font-weight: normal;
 
     a {
       max-height: 1.25em;
diff --git a/app/templates/partials/jobs/notifications.html b/app/templates/partials/jobs/notifications.html
index 2dd4ecdc8..9241aa83f 100644
--- a/app/templates/partials/jobs/notifications.html
+++ b/app/templates/partials/jobs/notifications.html
@@ -1,4 +1,4 @@
-{% from "components/table.html" import list_table, field, right_aligned_field_heading %}
+{% from "components/table.html" import list_table, field, right_aligned_field_heading, date_field, row_heading %}
 
 <div
   {% if not finished %}
@@ -18,17 +18,22 @@
         empty_message="No messages to show yet",
         field_headings=[
           'Recipient',
+          'Time',
           right_aligned_field_heading('Status')
-        ]
+        ],
+        field_headings_visible=False
       ) %}
-        {% call field() %}
+        {% call row_heading() %}
           {{ item.to }}
         {% endcall %}
+        {{ date_field(
+          (item.updated_at or item.created_at)|format_datetime_short
+        ) }}
         {% call field(
           align='right',
-          status='error' if item.status == 'Failed' else 'default'
+          status=item.status|format_notification_status_as_field_status
         ) %}
-          {{ item.status|format_notification_status }} at {{ (item.updated_at or item.created_at)|format_time }}
+          {{ item.status|format_notification_status(item.template.template_type) }}
         {% endcall %}
       {% endcall %}
     {% else %}
diff --git a/tests/app/main/views/test_jobs.py b/tests/app/main/views/test_jobs.py
index 473367424..791183dd7 100644
--- a/tests/app/main/views/test_jobs.py
+++ b/tests/app/main/views/test_jobs.py
@@ -47,7 +47,8 @@ def test_should_show_page_for_one_job(
         content = response.get_data(as_text=True)
         assert "{}: Your vehicle tax is about to expire".format(service_one['name']) in content
         assert file_name in content
-        assert "Delivered at 11:10" in content
+        assert 'Delivered' in content
+        assert '11:10' in content
 
 
 @freeze_time("2016-01-01 11:09:00.061258")
@@ -75,7 +76,8 @@ def test_should_show_updates_for_one_job_as_json(
         assert '07123456789' in content['notifications']
         assert 'Status' in content['notifications']
         assert job_json['status'] in content['status']
-        assert 'Delivered at 11:10' in content['notifications']
+        assert 'Delivered' in content['notifications']
+        assert '11:10' in content['notifications']
         assert 'Uploaded by Test User on 1 January at 11:09' in content['status']