Show org name in header (#215)

* Show org name in header
* Use BSU name in places

Author: edwardhorsford

app/locals.js

@@ -1,13 +1,19 @@
 // app/locals.js
 
 module.exports = (config) => (req, res, next) => {
+  const currentUser = req.session.data.currentUser
+  const currentBSU = currentUser
+    ? req.session.data.breastScreeningUnits?.find(unit => unit.id === currentUser.breastScreeningUnit)
+    : null
+
   const locals = {
     serviceName: config.serviceName,
     currentUrl: req.path,
     flash: req.flash(),
     query: req.query,
     referrerChain: req.query.referrerChain,
-    currentUser: req.session.data.currentUser,
+    currentUser: currentUser,
+    currentBSU: currentBSU,
     isAppointmentWorkflow: false
   }
 

app/views/_templates/layout-base.html

@@ -84,9 +84,12 @@
   {{ header({
     account: {
       items: [
+        {
+          text: currentBSU.name
+        },
         {
           href: "#",
-          text: data.currentUser.email,
+          text: (data.currentUser.lastName | upper) + ", " + (data.currentUser.firstName),
           icon: true
         },
         {

app/views/clinics/index.html

@@ -13,16 +13,14 @@
   {% endswitch %}
 {% endset %}
 
+{# Can get to dashboard using main nav instead #}
 {% set hideBackLink = true %}
 
 {% set gridColumn = "nhsuk-grid-column-full" %}
 
-{# {% set back = {
-  href: "/dashboard",
-  text: "Dashboard"
-} %} #}
-
 {% block pageContent %}
+
+  <span class="nhsuk-caption-l">{{ currentBSU.name }}</span>
   <h1>{{pageHeading}}</h1>
 
   {% set secondaryNavItems = [] %}

app/views/clinics/show.html

@@ -10,6 +10,8 @@
 
 
 {% block pageContent %}
+
+  {# Todo: this could instead use the currentBSU local variable though that relates to the signed in user #}
   {% set unit = data.breastScreeningUnits | findById(clinic.breastScreeningUnitId) %}
   {{ filteredEvents | log("Filtered events")}}
   {# {% set events = data.events | getClinicEvents(clinicId) %} #}