From 1047ddae38661c1b710829238faa12e59f6aaeac Mon Sep 17 00:00:00 2001
From: Imdad Ahad <imdad.ahad@digital.cabinet-office.gov.uk>
Date: Thu, 2 Mar 2017 22:53:32 +0000
Subject: [PATCH] Refactor to have all provider templates in one folder and
 separate template for provider history

---
 app/templates/views/providers.html            | 68 ---------------
 .../edit-provider.html}                       |  0
 app/templates/views/providers/provider.html   | 48 +++++++++++
 app/templates/views/providers/providers.html  | 84 +++++++++++++++++++
 4 files changed, 132 insertions(+), 68 deletions(-)
 delete mode 100644 app/templates/views/providers.html
 rename app/templates/views/{provider.html => providers/edit-provider.html} (100%)
 create mode 100644 app/templates/views/providers/provider.html
 create mode 100644 app/templates/views/providers/providers.html

diff --git a/app/templates/views/providers.html b/app/templates/views/providers.html
deleted file mode 100644
index 377c99e3e..000000000
--- a/app/templates/views/providers.html
+++ /dev/null
@@ -1,68 +0,0 @@
-{% extends "withoutnav_template.html" %}
-{% from "components/table.html" import list_table, field, text_field, link_field, right_aligned_field_heading, hidden_field_heading %}
-
-{% block per_page_title %}
-Providers
-{% endblock %}
-
-{% block maincolumn_content %}
-
-<div class="grid-row">
-    <div class="column-two-thirds">
-        <h1 class="heading-large">Providers</h1>
-
-        <h2 class="heading-medium">SMS</h2>
-
-        {% call(item, row_number) list_table(
-    sms_providers,
-    caption="SMS providers",
-    caption_visible=False,
-    empty_message='No email providers',
-    field_headings=['Provider', 'Priority', 'Active', 'Last Updated', ''],
-    field_headings_visible=True
-  ) %}
-
-   {{ text_field(item.display_name) }}
-
-    {{ text_field(item.priority) }}
-
-    {{ text_field(item.active) }}
-
-    {% if item.updated_at %}
-        {{ text_field(item.updated_at|format_datetime_short) }}
-    {% else %}
-        {{ text_field('None') }}
-    {% endif %}
-
-    {{ link_field('change', url_for('main.view_provider', provider_id=item.id)) }}
-
-
-  {% endcall %}
-
-        <h2 class="heading-medium">Email</h2>
-
-
- {% call(item, row_number) list_table(
-    email_providers,
-    caption="Email providers",
-    caption_visible=False,
-    empty_message='No email providers',
-    field_headings=['Provider', 'Priority', 'Active', ''],
-    field_headings_visible=True
-  ) %}
-
-   {{ text_field(item.display_name) }}
-
-    {{ text_field(item.priority) }}
-
-    {{ text_field(item.active) }}
-
-    {{ link_field('change', url_for('main.view_provider', provider_id=item.id)) }}
-
-  {% endcall %}
-
-
-    </div>
-</div>
-
-{% endblock %}
diff --git a/app/templates/views/provider.html b/app/templates/views/providers/edit-provider.html
similarity index 100%
rename from app/templates/views/provider.html
rename to app/templates/views/providers/edit-provider.html
diff --git a/app/templates/views/providers/provider.html b/app/templates/views/providers/provider.html
new file mode 100644
index 000000000..22d7e61a4
--- /dev/null
+++ b/app/templates/views/providers/provider.html
@@ -0,0 +1,48 @@
+{% extends "withoutnav_template.html" %}
+{% from "components/table.html" import list_table, field, text_field, link_field, right_aligned_field_heading, hidden_field_heading %}
+
+{% block per_page_title %}
+Provider versions
+{% endblock %}
+
+{% block maincolumn_content %}
+
+<div class="grid-row">
+    <div class="column-two-thirds">
+        <h1 class="heading-large">{{ provider_versions[0].display_name }}</h1>
+
+        {% call(item, row_number) list_table(
+    provider_versions,
+    caption='',
+    caption_visible=False,
+    empty_message='No history for this provider',
+    field_headings=['Version', 'Last Updated', 'Updated By', 'Priority', 'Active'],
+    field_headings_visible=True
+  ) %}
+
+    {{ text_field(item.version) }}
+
+    {% if item.updated_at %}
+        {{ text_field(item.updated_at|format_datetime_short) }}
+    {% else %}
+        {{ text_field('None') }}
+    {% endif %}
+
+    {% if item.created_by %}
+        {{ text_field(item.created_by.name) }}
+    {% else %}
+        {{ text_field('None') }}
+    {% endif %}
+
+    {{ text_field(item.priority) }}
+
+    {{ text_field(item.active) }}
+
+  {% endcall %}
+
+      <a class="page-footer-back-link" href="{{ url_for('main.view_providers') }}">Back to Providers</a>
+
+    </div>
+</div>
+
+{% endblock %}
diff --git a/app/templates/views/providers/providers.html b/app/templates/views/providers/providers.html
new file mode 100644
index 000000000..f6529fc50
--- /dev/null
+++ b/app/templates/views/providers/providers.html
@@ -0,0 +1,84 @@
+{% extends "withoutnav_template.html" %}
+{% from "components/table.html" import list_table, field, text_field, link_field, right_aligned_field_heading, hidden_field_heading %}
+{% from "components/show-more.html" import show_more %}
+
+{% block per_page_title %}
+Providers
+{% endblock %}
+
+{% block maincolumn_content %}
+
+<div class="grid-row">
+    <div class="column-two-thirds">
+        <h1 class="heading-large">Providers</h1>
+
+        <h2 class="heading-medium">SMS</h2>
+
+        {% call(item, row_number) list_table(
+            sms_providers,
+            caption="SMS providers",
+            caption_visible=False,
+            empty_message='No email providers',
+            field_headings=['Provider', 'Priority', 'Active', 'Last Updated', 'Updated By'],
+            field_headings_visible=True
+        ) %}
+
+            {{ link_field(item.display_name, url_for('main.view_provider', provider_id=item.id)) }}
+
+            {{ text_field(item.priority) }}
+
+            {{ text_field(item.active) }}
+
+            {% if item.updated_at %}
+                {{ text_field(item.updated_at|format_datetime_short) }}
+            {% else %}
+                {{ text_field('None') }}
+            {% endif %}
+
+            {% if item.created_by %}
+                {{ text_field(item.created_by.name) }}
+            {% else %}
+                {{ text_field('None') }}
+            {% endif %}
+
+            {{ link_field('change', url_for('main.edit_provider', provider_id=item.id)) }}
+
+        {% endcall %}
+
+        <h2 class="heading-medium">Email</h2>
+
+        {% call(item, row_number) list_table(
+            email_providers,
+            caption="Email providers",
+            caption_visible=False,
+            empty_message='No email providers',
+            field_headings=['Provider', 'Priority', 'Active', 'Last Updated', 'Updated By'],
+            field_headings_visible=True
+        ) %}
+
+            {{ link_field(item.display_name, url_for('main.view_provider', provider_id=item.id)) }}
+
+            {{ text_field(item.priority) }}
+
+            {{ text_field(item.active) }}
+
+            {% if item.updated_at %}
+                {{ text_field(item.updated_at|format_datetime_short) }}
+            {% else %}
+                {{ text_field('None') }}
+            {% endif %}
+
+            {% if item.created_by %}
+                {{ text_field(item.created_by.name) }}
+            {% else %}
+                {{ text_field('None') }}
+            {% endif %}
+
+            {{ link_field('change', url_for('main.edit_provider', provider_id=item.id)) }}
+
+        {% endcall %}
+
+    </div>
+</div>
+
+{% endblock %}