Update lists interface (#486)

This updates the Lists interface so that you're now asked which date the
list is for, but if you select 'No date' then you're asked to give the
list a name instead.

The interface is now a bit more 'working' so that it can be tested.

---------

Co-authored-by: Frankie Roberto <[email protected]>

Author: johnrimmer2

app/data/session-data-defaults.js

@@ -11,6 +11,7 @@ module.exports = {
   users: users,
   vaccines: vaccines,
   vaccineStock: [],
+  lists: [],
   nhsNumberKnown: "yes",
   currentUserId: "2387441662601",
   currentOrganisationId: "RW3",

app/lib/utils/date-from-year-month-day.js

@@ -0,0 +1,30 @@
+// Returns a date object from a valid year, month, and day.
+// Note: inputs can be strings, and month is based on 1 = Jan
+// rather than 0 = Jan
+// Time is set to midday
+
+/**
+ * Returns a date object from a valid year, month, and day.
+ *
+ *  Note: inputs can be strings, and month is based on 1 = Jan
+ * rather than 0 = Jan
+ *
+ * @param {String | Int} year - The year as a string or number
+ * @param {String | Int} month - The month as a string or number
+ * @param {String | Int} day - The day as a string or number
+ * @returns {*} Either a valid Date object or null
+ */
+function dateFromYearMonthDay(year, month, day) {
+  const yearInt = parseInt(year)
+  const monthInt = parseInt(month)
+  const dayInt = parseInt(day)
+
+  if (yearInt > 0 && monthInt > 0 && dayInt > 0) {
+    return new Date(yearInt, (monthInt - 1), dayInt, 12)
+  } else {
+    return null
+  }
+}
+
+module.exports.dateFromYearMonthDay = dateFromYearMonthDay
+

app/routes/lists.js

@@ -1,29 +1,277 @@
+const { randomItem } = require('../lib/utils/random-item.js')
+const { dateFromYearMonthDay } = require('../lib/utils/date-from-year-month-day.js')
+
+
 module.exports = router => {
 
+    const listOfFirstNames = ["Scott", "Siera", "Ramsey", "Blair", "Gretchen", "Kelli", "Sheridan", "Anya", "Alexis", "Kegan", "Jamia", "Sunny", "Haley", "Elsa", "Ayanna", "Chiara", "Zander", "Oswaldo", "Paris", "Bennett", "Reyna", "Camryn", "Nehemiah", "Craig", "Jalil", "Derick", "Easton", "Mohammed", "Arnold", "Linnea", "Edna", "Cameron", "Gissell", "Melina", "Annalise", "Jalin", "Aric", "Kentrell", "Nyla", "Leslie", "Maranda", "Kinley", "Montana", "Britney", "Uriah", "Raul", "Vincent", "Dustin", "Grant", "Kia"]
+
+    const listOfLastNames = ["Menendez", "Salisbury", "Mateo", "Alarcon", "Lenz", "Potter", "Kramer", "Trevino", "Singleton", "Batchelor", "Witte", "Rhoades", "Barragan", "Watson", "Fiore", "Beattie", "Parr", "Traylor", "Gillette", "Kim", "Fennell", "Eubanks", "Ko", "Mcfarlane", "Waite", "Gaines", "Rosado", "Rao", "Bynum", "Wentz", "Cheng", "Loera", "Hyman", "Ferrell", "Nixon", "Pierre", "Strand", "Wirth", "Delagarza", "Dixon", "Yoon", "Hines", "Hinds", "Barron", "Bruce", "Pease", "Rhodes", "Doss", "Marsh", "France"]
 
   router.get('/lists', (req, res) => {
+    const data = req.session.data
+    const currentOrganisation = res.locals.currentOrganisation
+    const lists = data.lists.filter((list) => list.organisationId === currentOrganisation.id)
 
-    const currentOrganisation = res.locals.currentOrganisation;
-    const lists = currentOrganisation.lists || []
+    const vaccinesAdded = data.vaccineStock.length
+
+    if (vaccinesAdded === 0) { return res.render('lists/no-vaccines-added') }
+    if (lists.length === 0) { return res.render('lists/no-lists-created') }
+
+    const listSiteIds = [...new Set(lists.map((list) => list.siteId))]
+    const sites = currentOrganisation.sites.filter((site) => listSiteIds.includes(site.id))
 
     res.render('lists/index', {
-      lists
+      sites
+    })
+
+  })
+
+  router.get('/lists/site/:siteId', (req, res) => {
+    const currentOrganisation = res.locals.currentOrganisation
+    const siteId = req.params.siteId
+    const site = currentOrganisation.sites.find((site) => site.id === siteId)
+    const lists = req.session.data.lists.filter((list) => list.organisationId === currentOrganisation.id).filter((list) => list.siteId === siteId)
+
+    let justAddedList = null
+    if (req.query.justAddedId) {
+      justAddedList = req.session.data.lists.find((list) => list.id == req.query.justAddedId)
+    }
+
+    res.render('lists/team-lists', {
+      lists,
+      site,
+      justAddedList
+    })
+  })
+
+  router.get('/lists/team', (req, res) => {
+    const data = req.session.data
+    let sites = res.locals.currentOrganisation.sites || []
+
+    const vaccineStock = data.vaccineStock
+    const siteIdsWithVaccines = [...new Set(vaccineStock.map((vaccineAdded) => vaccineAdded.siteId))]
+
+    sites = sites.filter((site) => siteIdsWithVaccines.includes(site.id))
+
+    res.render('lists/team', {
+      sites
+    })
+
+  })
+
+  router.get('/lists/date', (req, res) => {
+    const today = new Date()
+    const day = 86400000 // number of milliseconds in a day
+    const daysToInclude = 5
+
+    let dates = []
+
+    for (let i = 0; i < daysToInclude; i++) {
+      let date = new Date(today.getTime() - (i * day))
+
+      dates.push(date.toISOString().substring(0,10))
+    }
+
+    res.render('lists/date', {
+      dates
     })
 
   })
 
-  router.post('/lists/add-numbers', (req, res) => {
+  router.post('/lists/date-answer', (req, res) => {
+    const date = req.session.data.date
+
+    if (date === '') {
+
+      res.redirect('/lists/name')
+
+    } else  {
+
+      res.redirect('/lists/add-nhs-numbers')
+
+    }
+  })
+
+  router.post('/lists/create', (req, res) => {
+    const data = req.session.data
+    const currentOrganisation = res.locals.currentOrganisation
 
-    const currentOrganisation = res.locals.currentOrganisation;
-    currentOrganisation.lists ||= []
+    const date = data.date
+    const otherDate = data.otherDate
+    const name = data.name
+    const siteId = data.siteId
+    const nhsNumbers = data.nhsNumbers.split(/\n/)
+    const id = Math.floor(Math.random() * 10000000).toString()
 
-    // This bit isn’t working yet so faked for now.
-    currentOrganisation.lists.push({
-      siteCode: "TODO"
+    // Only 1 of these is set
+    let listDate, listName
+
+    if (date === "") {
+      // Name based list
+      listDate = null
+      listName = name
+    } else {
+      // Date based list
+      listName = null
+
+      if (date === "other-date") {
+        listDate = dateFromYearMonthDay(otherDate.year, otherDate.month, otherDate.day).toISOString().substring(0,10)
+      } else {
+        listDate = date
+      }
+    }
+
+    const patients = nhsNumbers.map(function(nhsNumber) {
+      return {
+        nhsNumber: nhsNumber,
+        firstName: randomItem(listOfFirstNames),
+        lastName: randomItem(listOfLastNames),
+        dateOfBirth: "1945-01-18"
+      }
+    })
+
+    data.lists.push({
+      id: id,
+      organisationId: currentOrganisation.id,
+      siteId: siteId,
+      date: listDate,
+      name: listName,
+      patients: patients
     })
 
-    res.redirect('/lists/list')
+    // reset values
+    data.date = null
+    data.otherDate = null
+    data.name = null
+    data.nhsNumbers = null
+
+    res.redirect(`/lists/site/${siteId}?justAddedId=${id}`)
 
   })
 
+  router.get('/lists/list/:id', (req, res) => {
+    const data = req.session.data
+    const id = req.params.id
+    const q = req.query.q
+    const patientList = data.lists.find((list) => list.id === id)
+
+    if (!patientList) { return res.redirect('/lists') }
+
+    const totalPatients = patientList.patients.length
+
+    let patients = patientList.patients
+
+    if (q && q !== "") {
+
+      patients = patients.filter(function(patient) {
+        return (
+          patient.firstName.toLowerCase().startsWith(q.toLowerCase()) ||
+          patient.lastName.toLowerCase().startsWith(q.toLowerCase()) ||
+          (patient.firstName + " " + patient.lastName).toLowerCase().startsWith(q.toLowerCase()) ||
+          patient.nhsNumber === q
+        )
+
+      })
+    }
+
+    res.render('lists/list', {
+      patientList,
+      patients,
+      totalPatients
+    })
+  })
+
+  router.get('/lists/list/:id/edit-name', (req, res) => {
+    const data = req.session.data
+    const id = req.params.id
+    const patientList = data.lists.find((list) => list.id === id)
+
+    if (!patientList) { return res.redirect('/lists') }
+
+    res.render('lists/edit-name', {
+      patientList
+    })
+  })
+
+  router.post('/lists/:id/update-name', (req, res) => {
+    const data = req.session.data
+    const id = req.params.id
+    const patientList = data.lists.find((list) => list.id === id)
+
+    if (!patientList) { return res.redirect('/lists') }
+
+    patientList.name = data.name
+
+    res.redirect(`/lists/list/${patientList.id}`)
+  })
+
+  router.get('/lists/list/:id/add', (req, res) => {
+    const data = req.session.data
+    const id = req.params.id
+    const patientList = data.lists.find((list) => list.id === id)
+
+    if (!patientList) { return res.redirect('/lists') }
+
+    res.render('lists/add-more-nhs-numbers', {
+      patientList
+    })
+  })
+
+  router.post('/lists/:id/nhs-numbers-added', (req, res) => {
+    const data = req.session.data
+    const id = req.params.id
+    const patientList = data.lists.find((list) => list.id === id)
+
+    if (!patientList) { return res.redirect('/lists') }
+
+    const nhsNumbers = data.nhsNumbers.split(/\n/)
+
+    for (nhsNumber of nhsNumbers) {
+      patientList.patients.push({
+        nhsNumber: nhsNumber,
+        firstName: randomItem(listOfFirstNames),
+        lastName: randomItem(listOfLastNames),
+        dateOfBirth: "1945-01-18"
+      })
+    }
+
+    // reset values
+    data.date = null
+    data.otherDate = {}
+    data.name = null
+    data.nhsNumbers = null
+
+    res.redirect(`/lists/list/${patientList.id}`)
+
+  })
+
+  router.get('/lists/list/:id/delete', (req, res) => {
+    const data = req.session.data
+    const id = req.params.id
+    const patientList = data.lists.find((list) => list.id === id)
+
+    if (!patientList) { return res.redirect('/lists') }
+
+    res.render('lists/delete', {
+      patientList
+    })
+  })
+
+  router.post('/lists/:id/deleted', (req, res) => {
+    const data = req.session.data
+    const id = req.params.id
+    const patientList = data.lists.find((list) => list.id === id)
+    const siteId = patientList.siteId
+
+    if (!patientList) { return res.redirect('/lists') }
+
+    // Remove item from array using 'splice', which takes an index
+    data.lists.splice(data.lists.indexOf(patientList), 1)
+
+    res.redirect(`/lists/site/${siteId}?justDeleted=true`)
+
+  })
+
+
 }

app/views/includes/header-logged-in-organisation.html

@@ -32,17 +32,22 @@
       },
       {
         href: "/record-vaccinations",
-        text: ("Record vaccinations <span class=\"nhsuk-tag app-tag--header nhsuk-u-margin-left-2\">New</span>") | safe,
+        text: "Record vaccinations",
         active: (currentSection == "vaccinate")
       },
+      {
+        href: "/lists",
+        text: ("Lists <span class=\"nhsuk-tag app-tag--header nhsuk-u-margin-left-2\">New</span>") | safe,
+        active: (currentSection == "lists")
+      },
       {
         href: "/vaccines",
         text: "Vaccines",
         active: (currentSection == "vaccines")
       } if (currentUser and (["Lead administrator", "Administrator"] | arrayOrStringIncludes(organisationSetting.permissionLevel))),
       {
         href: "/records",
-        html: "Records <span class=\"nhsuk-tag app-tag--header nhsuk-u-margin-left-2\">New</span>" | safe,
+        text: "Records",
         active: (currentSection == "records")
       } if (currentUser and (["Lead administrator", "Administrator"] | arrayOrStringIncludes(organisationSetting.permissionLevel))),
       {