Update index page

Author: frankieroberto

app/routes/regions.js

@@ -2,13 +2,17 @@ module.exports = router => {
 
   router.get('/regions', (req, res) => {
     const data = req.session.data
-    const organisations = data.organisations.filter((organisation) => (organisation.region === "Y61") && (organisation.status != "Closed"))
+    const organisations = data.organisations.filter((organisation) => (organisation.region === "Y61") && (["Active", "Deactivated"].includes(organisation.status)))
 
     const closedOrganisationsCount = data.organisations.filter((organisation) => (organisation.region === "Y61" && organisation.status == "Closed")).length
 
+    const awaitingApprovalOrganisationsCount = data.organisations.filter((organisation) => (organisation.region === "Y61" && organisation.status == "Applied")).length
+
+
     res.render('regions/index', {
       organisations,
-      closedOrganisationsCount
+      closedOrganisationsCount,
+      awaitingApprovalOrganisationsCount
     })
   })
 

app/views/regions/index.html

@@ -18,7 +18,9 @@ <h1 class="nhsuk-heading-xl">North West</h1>
 
       <p class="nhsuk-body-l">Once they’re set up, they can add other users and vaccination sites.</p>
 
-      <p class="nhsuk-body-l">You have <a href="/regions/awaiting-approval">4 organisations</a> awaiting approval.</p>
+      {% if awaitingApprovalOrganisationsCount > 0 %}
+        <p class="nhsuk-body-l">You have <a href="/regions/awaiting-approval">{{ awaitingApprovalOrganisationsCount | plural("organisation") }}</a> awaiting approval.</p>
+      {% endif %}
 
 
       {% from 'inset-text/macro.njk' import insetText %}
@@ -38,14 +40,14 @@ <h1 class="nhsuk-heading-xl">North West</h1>
       <div class="nhsuk-grid-column-full">
 
           <table class="nhsuk-table">
-            <caption class="nhsuk-table__caption nhsuk-table__caption--m">Organisations added</caption>
+            <caption class="nhsuk-table__caption nhsuk-table__caption--m">Current organisations</caption>
             <thead role="rowgroup" class="nhsuk-table__head">
               <tr role="row">
                 <th role="columnheader" class="" scope="col">
-                  Organisation
+                  Name
                 </th>
                 <th role="columnheader" class="" scope="col">
-                  ODS code
+                  ODS&nbsp;code
                 </th>
                 <th role="columnheader" class="" scope="col">
                   Type