diff --git a/app/filters.js b/app/filters.js index d8e467d..e6c88c4 100644 --- a/app/filters.js +++ b/app/filters.js @@ -10,6 +10,15 @@ module.exports = function (env) { /* eslint-disable-line no-unused-vars */ */ const filters = prototypeFilters; + + filters.dayName = function(isoDate) { + + const date = new Date(Date.parse(isoDate)) + const dateFormatter = new Intl.DateTimeFormat('en-GB', {weekday: 'short'}); + + return dateFormatter.format(date) + } + /* ------------------------------------------------------------------ add your methods to the filters obj below this comment block: @example: diff --git a/app/routes.js b/app/routes.js index 60a40eb..983dd67 100644 --- a/app/routes.js +++ b/app/routes.js @@ -12,5 +12,6 @@ require('./routes/reports')(router) require('./routes/prototype-admin')(router) require('./routes/support')(router) require('./routes/auth')(router) +require('./routes/home')(router) module.exports = router; diff --git a/app/routes/home.js b/app/routes/home.js new file mode 100644 index 0000000..76ed984 --- /dev/null +++ b/app/routes/home.js @@ -0,0 +1,92 @@ +module.exports = router => { + + // Dashboard + router.get('/home', (req, res) => { + + const dateToday = new Date() + + const stats = [] + + let vaccines = ["RSV", "Pertussis"] + + if (Math.random() > 0.5) { vaccines.push("Flu") } + if (Math.random() > 0.5) { vaccines.push("Covid") } + + for (vaccine of vaccines) { + + let vaccineStat = { + vaccine: vaccine, + days: [] + } + + for (let i = -1; i < 8; i++) { + + let day = new Date(dateToday) + day.setDate(day.getDate() - i) + + let count = Math.round(Math.random() * 20) + 1 + if (i > 0) { + count += Math.round(Math.random() * 150) + } + + vaccineStat.days.push({ + date: day.toISOString().substring(0,10), + count: count + }) + } + + stats.push(vaccineStat) + } + + res.render('home/index', { + stats + }) + }) + + // Site-specific dashboard + router.get('/home/:siteId', (req, res) => { + + const siteId = req.params.siteId + const site = req.session.data.sites[siteId] + const dateToday = new Date() + const stats = [] + + let vaccines = ["RSV", "Pertussis"] + + if (Math.random() > 0.5) { vaccines.push("Flu") } + if (Math.random() > 0.5) { vaccines.push("Covid") } + + for (vaccine of vaccines) { + + let vaccineStat = { + vaccine: vaccine, + days: [] + } + + for (let i = -1; i < 8; i++) { + + let day = new Date(dateToday) + day.setDate(day.getDate() - i) + + let count = Math.round(Math.random() * 5) + 1 + if (i > 0) { + count += Math.round(Math.random() * 30) + } + + vaccineStat.days.push({ + date: day.toISOString().substring(0,10), + count: count + }) + } + + stats.push(vaccineStat) + } + + + res.render('home/site', { + site, + siteId, + stats + }) + }) +} diff --git a/app/views/home/index.html b/app/views/home/index.html new file mode 100644 index 0000000..e9a2038 --- /dev/null +++ b/app/views/home/index.html @@ -0,0 +1,169 @@ +{% extends 'layout.html' %} + +{% block pageTitle %} + {{ currentOrganisation.name }} – Home +{% endblock %} + +{% set currentSection = "home" %} + +{% set sites = [] %} +{% for vaccine in (data.vaccines) %} + {% if not (sites | arrayOrStringIncludes(vaccine.siteCode)) %} + {% set sites = (sites.push(vaccine.siteCode), sites) %} + {% endif %} +{% endfor %} + +{% block content %} +
+
+

{{ currentOrganisation.name }}

+ +

Total vaccinations

+ +
+
+ + + + + + +
+
+ + + + + + + {% for vaccineStat in stats %} + + {% endfor %} + + + + + + {% set firstStat = (stats | first ) %} + + {% for date in firstStat.days %} + {% if not loop.index0 == 0 %} + {% set total = 0 %} + + + + {% set dayIndex = loop.index0 %} + {% for vaccineStat in stats %} + {% set total = total + vaccineStat.days[dayIndex].count %} + + {% endfor %} + + + {% endif %} + {% endfor %} + + +
Past 7 days by vaccine
+ Date + + {{ vaccineStat.vaccine }} + + Total +
+ {% if loop.index0 == 1 %} + Today + {% else %} + {{ date.date | dayName }} {{ date.date | govukDate("truncate") }} + + {% if loop.index0 == 2 %}(yesterday){% endif %} + {% endif %} + {{ vaccineStat.days[dayIndex].count }}{{ total }}
+ + + {% if (sites | length) > 1 %} + + + + + + {% for vaccineStat in stats %} + + {% endfor %} + + + + + {% for site in sites %} + {% set runningTotal = 0 %} + + + {% for vaccineStat in stats %} + {% set count = ((vaccineStat.days | first).count) * 3 %} + {% set runningTotal = runningTotal + count %} + + {% endfor %} + + + {% endfor %} + +
Past 7 days by site
+ Site + + {{ vaccineStat.vaccine }} + + Total +
{{ data.sites[site].name }}{{ count }}{{ runningTotal }}
+ {% endif %} + +

For a more detailed breakdown, create a report.

+ +
+
+{% endblock %} diff --git a/app/views/home/site.html b/app/views/home/site.html new file mode 100644 index 0000000..407cb1c --- /dev/null +++ b/app/views/home/site.html @@ -0,0 +1,130 @@ +{% extends 'layout.html' %} + +{% block pageTitle %} + {{ site.name }} - {{ currentOrganisation.name }} – Home +{% endblock %} + +{% set currentSection = "home" %} + +{% block beforeContent %} + {{ backLink({ + href: "/home", + text: "Back" + }) }} +{% endblock %} + +{% block content %} +
+
+ +

{{ site.name }}

+ + +

Total vaccinations

+
+
+ + + + + +
+
+ + + + + + + {% for vaccineStat in stats %} + + {% endfor %} + + + + + + {% set firstStat = (stats | first ) %} + + {% for date in firstStat.days %} + {% if not loop.index0 == 0 %} + {% set total = 0 %} + + + + {% set dayIndex = loop.index0 %} + {% for vaccineStat in stats %} + {% set total = total + vaccineStat.days[dayIndex].count %} + + {% endfor %} + + + {% endif %} + {% endfor %} + + +
Past 7 days by vaccine
+ Date + + {{ vaccineStat.vaccine }} + + Total +
+ {% if loop.index0 == 1 %} + Today + {% else %} + {{ date.date | dayName }} {{ date.date | govukDate("truncate") }} + + {% if loop.index0 == 2 %}(yesterday){% endif %} + {% endif %} + {{ vaccineStat.days[dayIndex].count }}{{ total }}
+
+
+{% endblock %} diff --git a/app/views/includes/header-logged-in-organisation.html b/app/views/includes/header-logged-in-organisation.html index 8311733..bec3880 100644 --- a/app/views/includes/header-logged-in-organisation.html +++ b/app/views/includes/header-logged-in-organisation.html @@ -7,6 +7,11 @@ "showNav": "true", "showSearch": "false", "primaryLinks": [ + { + url : "/home/", + label : "Home", + classes: ("app-header__navigation-item--current" if currentSection == "home") + }, { url : "/find-a-patient", label : "Find a patient",