updates to investment status component

uktrade · Aug 11, 2017 · 6e70288 · 6e70288
1 parent 83a24e6
commit 6e70288
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 138 deletions.
diff --git a/assets/stylesheets/_components.scss b/assets/stylesheets/_components.scss
@@ -12,13 +12,13 @@
 @import "components/local-nav";
 @import "components/messages";
 @import "components/meta-item";
+@import "components/meta-list";
 @import "components/metadata-list";
 @import "components/pagination";
 @import "components/phase-badge";
 @import "components/proposition-menu";
 @import "components/results";
 @import "components/results-summary";
-@import "components/status-bar";
 
 // Style examples on components page
 @import "components/.example";
diff --git a/assets/stylesheets/components/_local-header.scss b/assets/stylesheets/components/_local-header.scss
@@ -18,11 +18,6 @@
     margin-bottom: $default-spacing-unit;
   }
 
-  .status-bar {
-    margin-top: $default-spacing-unit * 2;
-    margin-bottom: -$default-spacing-unit;
-  }
-
   .c-entity-search__aggregations {
     margin-bottom: -$default-spacing-unit * 2;
   }

diff --git a/assets/stylesheets/components/_meta-list.scss b/assets/stylesheets/components/_meta-list.scss
@@ -0,0 +1,11 @@
+@import "../settings";
+
+.c-meta-list {
+  .c-meta-item {
+    margin-right: $default-spacing-unit;
+  }
+
+  .c-meta-item__label {
+    display: block;
+  }
+}
diff --git a/assets/stylesheets/components/_status-bar.scss b/assets/stylesheets/components/_status-bar.scss
diff --git a/assets/stylesheets/layout/_assemblies.scss b/assets/stylesheets/layout/_assemblies.scss
@@ -34,6 +34,10 @@
     margin-top: $default-spacing-unit * 2;
     margin-bottom: $default-spacing-unit * 2;
   }
+
+  .c-meta-list {
+    margin-top: $default-spacing-unit;
+  }
 }
 
 [type="hidden"] + .c-form-group {

diff --git a/src/apps/investment-projects/middleware/shared.js b/src/apps/investment-projects/middleware/shared.js
@@ -41,9 +41,17 @@ async function getInvestmentDetails (req, res, next, id = req.params.id) {
 
     res.locals.investmentStatus = {
       id: investmentData.id,
-      projectCode: investmentData.project_code,
+      meta: [
+        {
+          label: 'Project code',
+          value: investmentData.project_code,
+        },
+        {
+          label: 'Valuation',
+          value: investmentData.value_complete ? 'Project valued' : 'Not yet valued',
+        },
+      ],
       stageName: investmentData.stage.name,
-      valuation: investmentData.value_complete ? 'Project valued' : 'Not yet valued',
       company: {
         name: investmentData.investor_company.name,
         url: buildCompanyUrl(investmentData.investor_company),

diff --git a/src/apps/investment-projects/views/_layout.njk b/src/apps/investment-projects/views/_layout.njk
@@ -10,9 +10,12 @@
     heading: investmentData.name,
     modifier: 'light-banner'
   }) %}
-    {% component 'investment-status', investmentStatus %}
 
-    {% if investmentData.archived %}
+  <div class="c-meta-list">
+    {{ investmentStatus.meta | map(callAsMacro('MetaItem')) | join | safe }}
+  </div>
+
+  {% if investmentData.archived %}
       <p class="infostrip">
         This investment project was archived on {{ investmentData.archived_on | formatDate }} by {{ investmentData.archived_by.first_name }} {{ investmentData.archived_by.last_name }}. <br>
         <strong>Archive reason:</strong> {{ investmentData.archived_reason }}<br>

diff --git a/src/templates/_components/investment-status.njk b/src/templates/_components/investment-status.njk
diff --git a/src/templates/_layouts/datahub-base.njk b/src/templates/_layouts/datahub-base.njk
@@ -14,6 +14,7 @@
 {% from "_macros/common.njk" import LocalHeader with context %}
 {% from "_macros/common.njk" import Pagination, LocalNav %}
 {% from "_macros/results.njk" import Results, ResultsFilters %}
+{% from "_macros/entities.njk" import MetaItem %}
 
 {% if IS_XHR %}
   {% extends "./xhr.njk" %}

diff --git a/test/unit/components/investment-status.test.js b/test/unit/components/investment-status.test.js