From 2e7f4785d06310a2c577b3a9fe34f1fb541887e3 Mon Sep 17 00:00:00 2001
From: fredkingham <fredkingham@gmail.com>
Date: Mon, 3 Apr 2017 15:50:14 +0100
Subject: [PATCH] make sure the icons appear

---
 .../pathway/templates/modal_pathway_base.html |  2 +-
 .../templates/modal_wizard_pathway.html       |  2 +-
 .../pathway/templates/page_pathway.html       |  7 ++--
 .../pathway/templates/pathway_base.html       |  2 +-
 .../pathway/templates/wizard_pathway.html     |  2 +-
 pathway/tests/pathways.py                     |  3 +-
 pathway/tests/test_views.py                   | 32 +++++++++++++++++++
 7 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/pathway/templates/pathway/templates/modal_pathway_base.html b/pathway/templates/pathway/templates/modal_pathway_base.html
index 4de7b4a..915fcbc 100644
--- a/pathway/templates/pathway/templates/modal_pathway_base.html
+++ b/pathway/templates/pathway/templates/modal_pathway_base.html
@@ -2,7 +2,7 @@
 <div class="modal-header">
   {% block pathway_header %}
     <h2>
-      <i ng-show="icon" class="[[ pathway.icon ]]"></i> {{ pathway.display_name }}
+      {% if pathway.icon %}{% icon pathway.icon %}{% endif %} {{ pathway.display_name }}
       <span ng-show="episode">
         ([[ episode.demographics[0].first_name ]] [[ episode.demographics[0].surname ]])
       </span>
diff --git a/pathway/templates/pathway/templates/modal_wizard_pathway.html b/pathway/templates/pathway/templates/modal_wizard_pathway.html
index f2fa87d..9e8e7d9 100644
--- a/pathway/templates/pathway/templates/modal_wizard_pathway.html
+++ b/pathway/templates/pathway/templates/modal_wizard_pathway.html
@@ -2,7 +2,7 @@
 {% load forms %}
 {% block pathway_header %}
   <h2>
-    <i ng-show="icon" class="[[ pathway.icon ]]"></i> {{ pathway.display_name }}
+    {% if pathway.icon %}{% icon pathway.icon %}{% endif %}  {{ pathway.display_name }}
     <span ng-show="episode">
       (<a href="/#/patient/[[ episode.demographics[0].patient_id ]]/[[ episode.demographics[0].id ]]">[[ episode.demographics[0].first_name ]] [[ episode.demographics[0].surname ]]</a>)
     </span>
diff --git a/pathway/templates/pathway/templates/page_pathway.html b/pathway/templates/pathway/templates/page_pathway.html
index 98afd98..b8df6c0 100644
--- a/pathway/templates/pathway/templates/page_pathway.html
+++ b/pathway/templates/pathway/templates/page_pathway.html
@@ -1,4 +1,5 @@
 {% extends "pathway/templates/pathway_base.html" %}
+{% load forms %}
 {% block pathway_body %}
   {% for step in pathway.get_steps %}
   <div pathway-step="{{ step.get_api_name }}" class="row">
@@ -6,9 +7,9 @@
       <div class="panel panel-default">
         <div class="panel-heading">
           <h3>
-            <span ng-show="step.get_icon">
-            <i class="{{ step.get_icon }}"></i>
-            </span>
+            {% if step.get_icon %}
+              {% icon step.get_icon %}
+            {% endif %}
             {{ step.get_display_name }}
           </h3>
         </div>
diff --git a/pathway/templates/pathway/templates/pathway_base.html b/pathway/templates/pathway/templates/pathway_base.html
index 970c616..c1029d7 100644
--- a/pathway/templates/pathway/templates/pathway_base.html
+++ b/pathway/templates/pathway/templates/pathway_base.html
@@ -5,7 +5,7 @@
       <div class="panel-heading">
         {% block pathway_header %}
           <h2>
-            <i ng-show="icon" class="[[ pathway.icon ]]"></i> {{ pathway.display_name }}
+            {% if pathway.icon %}{% icon pathway.icon %}{% endif %} {{ pathway.display_name }}
             <span ng-show="episode">
               (<a href="/#/patient/[[ episode.demographics[0].patient_id ]]/[[ episode.demographics[0].id ]]">[[ episode.demographics[0].first_name ]] [[ episode.demographics[0].surname ]]</a>)
             </span>
diff --git a/pathway/templates/pathway/templates/wizard_pathway.html b/pathway/templates/pathway/templates/wizard_pathway.html
index 0858a44..1175e83 100644
--- a/pathway/templates/pathway/templates/wizard_pathway.html
+++ b/pathway/templates/pathway/templates/wizard_pathway.html
@@ -19,7 +19,7 @@
               <div class="panel-heading">
                 <h3>
                   <span ng-show="step.icon">
-                  <i class="{{ step.icon }}"></i>
+                    {% icon step.get_icon %}
                   </span>
                   {{ step.get_display_name }}
                 </h3>
diff --git a/pathway/tests/pathways.py b/pathway/tests/pathways.py
index 4ab3a81..e339276 100644
--- a/pathway/tests/pathways.py
+++ b/pathway/tests/pathways.py
@@ -10,6 +10,7 @@ class PagePathwayExample(pathways.PagePathway):
     steps = (
         test_models.Demographics,
         steps.Step(model=test_models.DogOwner),
+        test_models.Colour,
     )
 
 
@@ -19,5 +20,5 @@ class WizardPathwayExample(pathways.WizardPathway):
     icon = "fa fa-something"
 
     steps = (
-        test_models.FamousLastWords,
+        test_models.Colour,
     )
diff --git a/pathway/tests/test_views.py b/pathway/tests/test_views.py
index 971a45e..f4ce478 100644
--- a/pathway/tests/test_views.py
+++ b/pathway/tests/test_views.py
@@ -1,6 +1,7 @@
 from opal.core.test import OpalTestCase
 from django.core.urlresolvers import reverse
 from pathway.tests import pathways as test_pathways
+import mock
 
 
 class PathwayIndexViewTestCase(OpalTestCase):
@@ -39,6 +40,9 @@ def test_integration_page_modal(self):
         self.assertIn("modal-body", response.content)
         self.assertIn('form name="form"', response.content)
 
+        # make sure the icon is rendered
+        self.assertIn('fa fa-something', response.content)
+
     def test_integration_page_non_modal(self):
         response = self.get_response(
             test_pathways.PagePathwayExample(), is_modal=False
@@ -47,6 +51,9 @@ def test_integration_page_non_modal(self):
         self.assertNotIn("modal-body", response.content)
         self.assertIn('form name="form"', response.content)
 
+        # make sure the icon is rendered
+        self.assertIn('fa fa-something', response.content)
+
     def test_integration_wizard_modal(self):
         response = self.get_response(
             test_pathways.WizardPathwayExample(), is_modal=True
@@ -55,6 +62,9 @@ def test_integration_wizard_modal(self):
         self.assertIn("modal-body", response.content)
         self.assertIn('form name="form"', response.content)
 
+        # make sure the icon is rendered
+        self.assertIn('fa fa-something', response.content)
+
     def test_integration_wizard_non_modal(self):
         response = self.get_response(
             test_pathways.WizardPathwayExample(), is_modal=False
@@ -64,8 +74,30 @@ def test_integration_wizard_non_modal(self):
         self.assertNotIn("modal-body", response.content)
         self.assertIn('form name="form"', response.content)
 
+        # make sure the icon is rendere
+        self.assertIn('fa fa-something', response.content)
+
     def test_login_required(self):
         response = self.get_response(
             test_pathways.WizardPathwayExample(), login=False
         )
         self.assertEqual(response.status_code, 302)
+
+    def test_step_rendered(self):
+        """
+            Make sure Step display name and icon
+            are rendered in the pathway templates
+        """
+        pathway_types = [
+            test_pathways.WizardPathwayExample,
+            test_pathways.PagePathwayExample
+        ]
+        for pathway in pathway_types:
+            for is_modal in [True, False]:
+                response = self.get_response(
+                    pathway(), is_modal=is_modal
+                )
+
+            self.assertEqual(response.status_code, 200)
+            self.assertIn("Colour", response.content)
+            self.assertIn('fa fa-something', response.content)