From 29d5bc4f51e4f40eece65ff2131ee39cbdf09a59 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Mon, 12 Sep 2016 11:33:30 +0100
Subject: [PATCH] Factor services table into a macro
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Since we’re going to have spearate tables for live and trial mode
services it saves copying and pasting to have a macro for them. Not
worth completely factoring out into a component because it’s only going
to be used on this page.
---
 app/templates/views/platform-admin.html | 88 +++++++++++++------------
 1 file changed, 47 insertions(+), 41 deletions(-)

diff --git a/app/templates/views/platform-admin.html b/app/templates/views/platform-admin.html
index f8c93e534..519ecb4ec 100644
--- a/app/templates/views/platform-admin.html
+++ b/app/templates/views/platform-admin.html
@@ -4,6 +4,51 @@
 {% from "components/browse-list.html" import browse_list %}
 {% from "components/table.html" import list_table, field, right_aligned_field_heading, hidden_field_heading, text_field %}
 
+{% macro services_table(services, caption) %}
+  {% call(item, row_number) list_table(
+    services,
+    caption=caption,
+    caption_visible=False,
+    field_headings=[
+      'Service',
+      hidden_field_heading('Status'),
+      right_aligned_field_heading('Sending'),
+      right_aligned_field_heading('Delivered'),
+      right_aligned_field_heading('Failed')
+    ],
+    field_headings_visible=True
+  ) %}
+    {% call field() %}
+      <div>
+        <a href="{{ url_for('main.service_dashboard', service_id=item['id']) }}" class="browse-list-link">{{ item['name'] }}</a>
+      </div>
+    {% endcall %}
+    {% if item['research_mode'] %}
+      {% call field() %}
+        <span class="research-mode">research mode</span>
+      {% endcall %}
+    {% elif not item['restricted'] %}
+      {% call field(status='error') %}
+        <span class="heading-medium">
+          Live
+        </span>
+      {% endcall %}
+    {% else %}
+      {{ text_field('') }}
+    {% endif %}
+    {% call field(align='right') %}
+      {{ big_number(item['sending'], smaller=True) }}
+    {% endcall %}
+    {% call field(align='right') %}
+      {{ big_number(item['delivered'], smaller=True) }}
+    {% endcall %}
+    {% call field(align='right', status='error' if 0 else '') %}
+      {{ big_number(item['failed'], smaller=True) }}
+    {% endcall %}
+  {% endcall %}
+{% endmacro %}
+
+
 {% block page_title %}
   Platform admin – GOV.UK Notify
 {% endblock %}
@@ -45,46 +90,7 @@
   </div>
 
   <h2 class='heading-medium visually-hidden'>Services</h2>
-  {% call(item, row_number) list_table(
-    service_stats,
-    caption="All services",
-    caption_visible=False,
-    field_headings=[
-      'Service',
-      hidden_field_heading('Status'),
-      right_aligned_field_heading('Sending'),
-      right_aligned_field_heading('Delivered'),
-      right_aligned_field_heading('Failed')
-    ],
-    field_headings_visible=True
-  ) %}
-    {% call field() %}
-      <div>
-        <a href="{{ url_for('main.service_dashboard', service_id=item['id']) }}" class="browse-list-link">{{ item['name'] }}</a>
-      </div>
-    {% endcall %}
-    {% if item['research_mode'] %}
-      {% call field() %}
-        <span class="research-mode">research mode</span>
-      {% endcall %}
-    {% elif not item['restricted'] %}
-      {% call field(status='error') %}
-        <span class="heading-medium">
-          Live
-        </span>
-      {% endcall %}
-    {% else %}
-      {{ text_field('') }}
-    {% endif %}
-    {% call field(align='right') %}
-      {{ big_number(item['sending'], smaller=True) }}
-    {% endcall %}
-    {% call field(align='right') %}
-      {{ big_number(item['delivered'], smaller=True) }}
-    {% endcall %}
-    {% call field(align='right', status='error' if 0 else '') %}
-      {{ big_number(item['failed'], smaller=True) }}
-    {% endcall %}
-  {% endcall %}
+
+  {{ services_table(service_stats, 'All services') }}
 
 {% endblock %}