diff --git a/app/filters.js b/app/filters.js index 31f90c6e..62339447 100644 --- a/app/filters.js +++ b/app/filters.js @@ -122,6 +122,8 @@ module.exports = function () { return Math.floor((today - inviteDay) / millisecondsPerDay) } + filters.ucFirst = (str) => str ? str.charAt(0).toUpperCase() + str.slice(1) : str + /* keep the following line to return your filters to the app */ return filters } diff --git a/app/routes/regions.js b/app/routes/regions.js index 98410604..860bb207 100644 --- a/app/routes/regions.js +++ b/app/routes/regions.js @@ -111,9 +111,11 @@ module.exports = router => { const data = req.session.data const organisationId = data.organisationId const organisation = data.allOrganisations.find((organisation) => organisation.id === organisationId) + const isFirstUser = !data.users.some(user => user.organisations && user.organisations.some(org => org.id === organisationId)) res.render('regions/add-email', { - organisation + organisation, + isFirstUser }) }) diff --git a/app/views/regions/add-email.html b/app/views/regions/add-email.html index 4c0ee1f6..ca6f708d 100644 --- a/app/views/regions/add-email.html +++ b/app/views/regions/add-email.html @@ -1,6 +1,6 @@ {% extends 'layout.html' %} -{% set pageName = "Add another user" %} +{% set pageName = "Add a user" if isFirstUser else "Add another user" %} {% set currentSection = "organisations" %} {% block beforeContent %} @@ -16,7 +16,7 @@
{{ organisation.name }} ({{ organisation.id }})
-

Add another user

+

{{ pageName }}

Choose a user at {{ organisation.name }}.

diff --git a/app/views/regions/vaccines.html b/app/views/regions/vaccines.html index 63adc954..989b29f0 100644 --- a/app/views/regions/vaccines.html +++ b/app/views/regions/vaccines.html @@ -21,7 +21,7 @@ {% for vaccine in (data.vaccines | sort(false, false, "name")) %} {% set items = (items.push({ value: vaccine.name, - text: (vaccine.name ) + text: vaccine.name | ucFirst }), items) %} {% endfor %}