diff --git a/app/data/appointments.js b/app/data/appointments.js
new file mode 100644
index 00000000..ad53ed61
--- /dev/null
+++ b/app/data/appointments.js
@@ -0,0 +1,852 @@
+// These are organisations set up as using RAVS
+const day = 86400000 // number of milliseconds in a day
+const toDateString = (offsetDays = 0) => (new Date(Date.now() + (offsetDays * day))).toISOString().substring(0,10)
+
+const dayPlus2 = toDateString(2)
+const dayPlus3 = toDateString(3)
+const dayPlus4 = toDateString(4)
+const dayPlus5 = toDateString(5)
+const dayPlus6 = toDateString(6)
+const dayPlus7 = toDateString(7)
+
+module.exports = [
+
+  {
+    id: "163473464363",
+    date: "today",
+    time: "10:00",
+    patient: {
+      nhsNumber: "9123123123",
+      firstName: "Alan",
+      lastName: "Teapot",
+      dateOfBirth: "1969-04-16",
+      contactDetails: {
+        mobile: "07588547704",
+        phone: "0111432626",
+        email: "alan.teapot@btinternet.com"
+      }
+    },
+    vaccinations: [
+      "COVID-19"
+    ]
+  },
+  {
+    id: "923532535",
+    date: "today",
+    time: "10:30",
+    patient: {
+      nhsNumber: "9841414141",
+      firstName: "Keith",
+      lastName: "Napkin",
+      dateOfBirth: "1976-02-12",
+      contactDetails: {
+        mobile: "077345813941"
+      }
+    },
+    vaccinations: [
+      "COVID-19",
+      "Flu"
+    ]
+  },
+  {
+    id: "2364364369",
+    date: "today",
+    time: "10:40",
+    patient: {
+      nhsNumber: "9841515715",
+      firstName: "Lynn",
+      lastName: "Feather",
+      dateOfBirth: "1963-05-23",
+      contactDetails: {
+        email: "lynn.feather@gmail.com"
+      }
+    },
+    vaccinations: [
+      "Flu", "RSV"
+    ]
+  },
+  {
+    id: "3026352592",
+    date: "today",
+    time: "11:10",
+    cancelled: {
+      reason: "patient"
+    },
+    patient: {
+      nhsNumber: "9835715151",
+      firstName: "Lorna",
+      lastName: "Biscuitbarrel",
+      dateOfBirth: "1962-08-19",
+      contactDetails: {
+        mobile: "07364824944"
+      }
+    },
+    vaccinations: [
+      "Flu"
+    ]
+  },
+  {
+    id: "410059235",
+    date: "today",
+    time: "11:20",
+    patient: {
+      nhsNumber: "9847471413",
+      firstName: "Moira",
+      lastName: "Packet",
+      dateOfBirth: "1950-04-14",
+      contactDetails: {
+        mobile: "07623842424"
+      }
+    },
+    vaccinations: [
+      "COVID-19"
+    ]
+  },
+  {
+    id: "5019581446",
+    date: "today",
+    time: "11:30",
+    patient: {
+      nhsNumber: "9841411411",
+      firstName: "Cliff",
+      lastName: "Sugarbowl",
+      dateOfBirth: "1957-01-23",
+      contactDetails: {
+        mobile: "07623913141"
+      }
+    },
+    vaccinations: [
+      "COVID-19"
+    ]
+  },
+  {
+    id: "69263464",
+    date: "today",
+    time: "11:40",
+    patient: {
+      nhsNumber: "9841411411",
+      firstName: "James",
+      lastName: "Brown",
+      dateOfBirth: "1952-04-19",
+      contactDetails: {
+        mobile: "0723456123",
+        email: "james.brown@hotmail.com"
+      }
+    },
+    vaccinations: [
+      "COVID-19"
+    ]
+  },
+  {
+    id: "7692855825",
+    date: "today",
+    time: "11:50",
+    patient: {
+      nhsNumber: "9917425141",
+      firstName: "Emma",
+      lastName: "Blue",
+      dateOfBirth: "1973-01-23",
+      contactDetails: {
+        mobile: "07524222525",
+        email: "emma.blue123@nhs.net"
+      }
+    },
+    vaccinations: [
+      "COVID-19", "RSV"
+    ]
+  },
+  {
+    id: "8928558275",
+    date: "today",
+    time: "12:10",
+    cancelled: {
+      reason: "organisation"
+    },
+    patient: {
+      nhsNumber: "9741851731",
+      firstName: "Charlie",
+      lastName: "Green",
+      dateOfBirth: "1983-06-12",
+      contactDetails: {
+        email: "charlie.green@hotmail.com"
+      }
+    },
+    vaccinations: [
+      "COVID-19"
+    ]
+  },
+  {
+    id: "9255253581",
+    date: "today",
+    time: "12:40",
+    cancelled: {
+      reason: "auto"
+    },
+    patient: {
+      nhsNumber: "9951736814",
+      firstName: "Jason",
+      lastName: "White",
+      dateOfBirth: "1998-03-19",
+      contactDetails: {
+        email: "jw225235@gmail.com"
+      }
+    },
+    vaccinations: [
+      "Flu"
+    ]
+  },
+  {
+    id: "634633242",
+    date: "yesterday",
+    time: "11:20",
+    patient: {
+      nhsNumber: "9918571751",
+      firstName: "Danny",
+      lastName: "Green",
+      dateOfBirth: "1998-03-19",
+      contactDetails: {
+        email: "dgreen@gmail.com"
+      }
+    },
+    vaccinations: [
+      "Flu"
+    ]
+  },
+  {
+    id: "10363212525",
+    date: "yesterday",
+    time: "13:20",
+    patient: {
+      nhsNumber: "99472754141",
+      firstName: "Jason",
+      lastName: "Black",
+      dateOfBirth: "1967-09-21",
+      contactDetails: {
+        email: "jblack@hotmail.com"
+      }
+    },
+    vaccinations: [
+      "Flu"
+    ],
+    vaccinationIds: ["464743636"]
+  },
+  {
+    id: "64639185885",
+    date: "tomorrow",
+    time: "08:55",
+    patient: {
+      nhsNumber: "9017474141",
+      firstName: "Mohammed",
+      lastName: "Khan",
+      dateOfBirth: "1993-01-23",
+      contactDetails: {
+        email: "mk25325@gmail.com"
+      }
+    },
+    vaccinations: [
+      "Flu"
+    ]
+  },
+  {
+    id: "64639185886",
+    date: "tomorrow",
+    time: "09:35",
+    patient: {
+      nhsNumber: "9017474142",
+      firstName: "Priya",
+      lastName: "Shaw",
+      dateOfBirth: "1988-02-17",
+      contactDetails: {
+        email: "priya.shaw@gmail.com"
+      }
+    },
+    vaccinations: [
+      "COVID-19"
+    ]
+  },
+  {
+    id: "64639185887",
+    date: "tomorrow",
+    time: "10:15",
+    patient: {
+      nhsNumber: "9017474143",
+      firstName: "Rita",
+      lastName: "Cooper",
+      dateOfBirth: "1971-11-03",
+      contactDetails: {
+        mobile: "07444555111"
+      }
+    },
+    vaccinations: [
+      "RSV"
+    ]
+  },
+  {
+    id: "64639185888",
+    date: "tomorrow",
+    time: "11:05",
+    patient: {
+      nhsNumber: "9017474144",
+      firstName: "Gary",
+      lastName: "Turner",
+      dateOfBirth: "1965-06-22",
+      contactDetails: {
+        email: "gary.turner@yahoo.co.uk"
+      }
+    },
+    vaccinations: [
+      "Flu"
+    ]
+  },
+  {
+    id: "64639185889",
+    date: "tomorrow",
+    time: "13:15",
+    patient: {
+      nhsNumber: "9017474145",
+      firstName: "Amina",
+      lastName: "Farah",
+      dateOfBirth: "1992-08-14",
+      contactDetails: {
+        mobile: "07500900100"
+      }
+    },
+    vaccinations: [
+      "COVID-19",
+      "Flu"
+    ]
+  },
+  {
+    id: "64639185890",
+    date: "tomorrow",
+    time: "15:00",
+    patient: {
+      nhsNumber: "9017474146",
+      firstName: "Liam",
+      lastName: "Osborne",
+      dateOfBirth: "1980-04-01",
+      contactDetails: {
+        email: "liam.osborne@outlook.com"
+      }
+    },
+    vaccinations: [
+      "COVID-19"
+    ]
+  },
+  {
+    id: "74639185891",
+    date: dayPlus2,
+    time: "09:05",
+    patient: {
+      nhsNumber: "9111000001",
+      firstName: "Helen",
+      lastName: "Bishop",
+      dateOfBirth: "1964-09-19",
+      contactDetails: {
+        email: "helen.bishop@gmail.com"
+      }
+    },
+    vaccinations: [
+      "Flu"
+    ]
+  },
+  {
+    id: "74639185892",
+    date: dayPlus2,
+    time: "09:50",
+    patient: {
+      nhsNumber: "9111000002",
+      firstName: "Nina",
+      lastName: "Ali",
+      dateOfBirth: "1975-01-28",
+      contactDetails: {
+        mobile: "07900111222"
+      }
+    },
+    vaccinations: [
+      "COVID-19"
+    ]
+  },
+  {
+    id: "74639185893",
+    date: dayPlus2,
+    time: "11:00",
+    patient: {
+      nhsNumber: "9111000003",
+      firstName: "Sean",
+      lastName: "Walsh",
+      dateOfBirth: "1983-03-06",
+      contactDetails: {
+        email: "sean.walsh@hotmail.com"
+      }
+    },
+    vaccinations: [
+      "RSV"
+    ]
+  },
+  {
+    id: "74639185894",
+    date: dayPlus2,
+    time: "13:20",
+    patient: {
+      nhsNumber: "9111000004",
+      firstName: "Monica",
+      lastName: "Reed",
+      dateOfBirth: "1959-12-11",
+      contactDetails: {
+        mobile: "07888123123"
+      }
+    },
+    vaccinations: [
+      "Flu",
+      "COVID-19"
+    ]
+  },
+  {
+    id: "74639185895",
+    date: dayPlus2,
+    time: "15:05",
+    patient: {
+      nhsNumber: "9111000005",
+      firstName: "Patrick",
+      lastName: "Moss",
+      dateOfBirth: "1990-07-02",
+      contactDetails: {
+        email: "patrick.moss@nhs.net"
+      }
+    },
+    vaccinations: [
+      "Flu"
+    ]
+  },
+  {
+    id: "74639185896",
+    date: dayPlus3,
+    time: "08:50",
+    patient: {
+      nhsNumber: "9111000006",
+      firstName: "Deborah",
+      lastName: "King",
+      dateOfBirth: "1962-05-29",
+      contactDetails: {
+        email: "deborah.king@gmail.com"
+      }
+    },
+    vaccinations: [
+      "COVID-19"
+    ]
+  },
+  {
+    id: "74639185897",
+    date: dayPlus3,
+    time: "09:40",
+    patient: {
+      nhsNumber: "9111000007",
+      firstName: "Owen",
+      lastName: "Price",
+      dateOfBirth: "1986-10-12",
+      contactDetails: {
+        mobile: "07777123456"
+      }
+    },
+    vaccinations: [
+      "Flu"
+    ]
+  },
+  {
+    id: "74639185898",
+    date: dayPlus3,
+    time: "10:55",
+    patient: {
+      nhsNumber: "9111000008",
+      firstName: "Irene",
+      lastName: "Stone",
+      dateOfBirth: "1978-04-07",
+      contactDetails: {
+        email: "irene.stone@outlook.com"
+      }
+    },
+    vaccinations: [
+      "RSV"
+    ]
+  },
+  {
+    id: "74639185899",
+    date: dayPlus3,
+    time: "13:10",
+    patient: {
+      nhsNumber: "9111000009",
+      firstName: "Calvin",
+      lastName: "Dale",
+      dateOfBirth: "1956-08-20",
+      contactDetails: {
+        mobile: "07666123456"
+      }
+    },
+    vaccinations: [
+      "Flu",
+      "COVID-19"
+    ]
+  },
+  {
+    id: "74639185900",
+    date: dayPlus3,
+    time: "14:45",
+    patient: {
+      nhsNumber: "9111000010",
+      firstName: "Yasmin",
+      lastName: "Cook",
+      dateOfBirth: "1994-02-18",
+      contactDetails: {
+        email: "yasmin.cook@gmail.com"
+      }
+    },
+    vaccinations: [
+      "COVID-19"
+    ]
+  },
+  {
+    id: "74639185901",
+    date: dayPlus4,
+    time: "09:15",
+    patient: {
+      nhsNumber: "9111000011",
+      firstName: "Peter",
+      lastName: "Lawrence",
+      dateOfBirth: "1960-01-03",
+      contactDetails: {
+        email: "peter.lawrence@hotmail.com"
+      }
+    },
+    vaccinations: [
+      "Flu"
+    ]
+  },
+  {
+    id: "74639185902",
+    date: dayPlus4,
+    time: "10:00",
+    patient: {
+      nhsNumber: "9111000012",
+      firstName: "Sophie",
+      lastName: "Tate",
+      dateOfBirth: "1989-07-09",
+      contactDetails: {
+        mobile: "07700111000"
+      }
+    },
+    vaccinations: [
+      "COVID-19"
+    ]
+  },
+  {
+    id: "74639185903",
+    date: dayPlus4,
+    time: "11:20",
+    patient: {
+      nhsNumber: "9111000013",
+      firstName: "Harriet",
+      lastName: "Nash",
+      dateOfBirth: "1972-12-24",
+      contactDetails: {
+        email: "harriet.nash@gmail.com"
+      }
+    },
+    vaccinations: [
+      "RSV"
+    ]
+  },
+  {
+    id: "74639185904",
+    date: dayPlus4,
+    time: "13:30",
+    patient: {
+      nhsNumber: "9111000014",
+      firstName: "Glen",
+      lastName: "Hughes",
+      dateOfBirth: "1954-03-31",
+      contactDetails: {
+        mobile: "07555111222"
+      }
+    },
+    vaccinations: [
+      "Flu",
+      "COVID-19"
+    ]
+  },
+  {
+    id: "74639185905",
+    date: dayPlus4,
+    time: "15:15",
+    patient: {
+      nhsNumber: "9111000015",
+      firstName: "Adele",
+      lastName: "Fox",
+      dateOfBirth: "1996-10-05",
+      contactDetails: {
+        email: "adele.fox@nhs.net"
+      }
+    },
+    vaccinations: [
+      "Flu"
+    ]
+  },
+  {
+    id: "74639185906",
+    date: dayPlus5,
+    time: "08:45",
+    patient: {
+      nhsNumber: "9111000016",
+      firstName: "Megan",
+      lastName: "Waters",
+      dateOfBirth: "1968-06-16",
+      contactDetails: {
+        email: "megan.waters@yahoo.co.uk"
+      }
+    },
+    vaccinations: [
+      "COVID-19"
+    ]
+  },
+  {
+    id: "74639185907",
+    date: dayPlus5,
+    time: "09:35",
+    patient: {
+      nhsNumber: "9111000017",
+      firstName: "Idris",
+      lastName: "Webb",
+      dateOfBirth: "1981-09-27",
+      contactDetails: {
+        mobile: "07333111222"
+      }
+    },
+    vaccinations: [
+      "Flu"
+    ]
+  },
+  {
+    id: "74639185908",
+    date: dayPlus5,
+    time: "10:50",
+    patient: {
+      nhsNumber: "9111000018",
+      firstName: "Chloe",
+      lastName: "Bennett",
+      dateOfBirth: "1977-11-15",
+      contactDetails: {
+        email: "chloe.bennett@gmail.com"
+      }
+    },
+    vaccinations: [
+      "RSV"
+    ]
+  },
+  {
+    id: "74639185909",
+    date: dayPlus5,
+    time: "13:05",
+    patient: {
+      nhsNumber: "9111000019",
+      firstName: "Dennis",
+      lastName: "Ward",
+      dateOfBirth: "1953-02-22",
+      contactDetails: {
+        mobile: "07444111999"
+      }
+    },
+    vaccinations: [
+      "Flu",
+      "COVID-19"
+    ]
+  },
+  {
+    id: "74639185910",
+    date: dayPlus5,
+    time: "14:55",
+    patient: {
+      nhsNumber: "9111000020",
+      firstName: "Farah",
+      lastName: "Iqbal",
+      dateOfBirth: "1991-01-30",
+      contactDetails: {
+        email: "farah.iqbal@outlook.com"
+      }
+    },
+    vaccinations: [
+      "COVID-19"
+    ]
+  },
+  {
+    id: "74639185911",
+    date: dayPlus6,
+    time: "09:10",
+    patient: {
+      nhsNumber: "9111000021",
+      firstName: "Ronan",
+      lastName: "Hall",
+      dateOfBirth: "1961-04-25",
+      contactDetails: {
+        email: "ronan.hall@gmail.com"
+      }
+    },
+    vaccinations: [
+      "Flu"
+    ]
+  },
+  {
+    id: "74639185912",
+    date: dayPlus6,
+    time: "10:05",
+    patient: {
+      nhsNumber: "9111000022",
+      firstName: "Neha",
+      lastName: "Patel",
+      dateOfBirth: "1984-12-04",
+      contactDetails: {
+        mobile: "07766111999"
+      }
+    },
+    vaccinations: [
+      "COVID-19"
+    ]
+  },
+  {
+    id: "74639185913",
+    date: dayPlus6,
+    time: "11:15",
+    patient: {
+      nhsNumber: "9111000023",
+      firstName: "Elaine",
+      lastName: "Curtis",
+      dateOfBirth: "1970-08-09",
+      contactDetails: {
+        email: "elaine.curtis@hotmail.com"
+      }
+    },
+    vaccinations: [
+      "RSV"
+    ]
+  },
+  {
+    id: "74639185914",
+    date: dayPlus6,
+    time: "13:25",
+    patient: {
+      nhsNumber: "9111000024",
+      firstName: "Trevor",
+      lastName: "Knight",
+      dateOfBirth: "1955-05-12",
+      contactDetails: {
+        mobile: "07888111888"
+      }
+    },
+    vaccinations: [
+      "Flu",
+      "COVID-19"
+    ]
+  },
+  {
+    id: "74639185915",
+    date: dayPlus6,
+    time: "15:00",
+    patient: {
+      nhsNumber: "9111000025",
+      firstName: "Leah",
+      lastName: "Mills",
+      dateOfBirth: "1997-06-28",
+      contactDetails: {
+        email: "leah.mills@nhs.net"
+      }
+    },
+    vaccinations: [
+      "Flu"
+    ]
+  },
+  {
+    id: "74639185916",
+    date: dayPlus7,
+    time: "09:00",
+    patient: {
+      nhsNumber: "9111000026",
+      firstName: "Gita",
+      lastName: "Singh",
+      dateOfBirth: "1966-03-10",
+      contactDetails: {
+        email: "gita.singh@gmail.com"
+      }
+    },
+    vaccinations: [
+      "COVID-19"
+    ]
+  },
+  {
+    id: "74639185917",
+    date: dayPlus7,
+    time: "09:55",
+    patient: {
+      nhsNumber: "9111000027",
+      firstName: "Marcus",
+      lastName: "Ellis",
+      dateOfBirth: "1982-07-21",
+      contactDetails: {
+        mobile: "07722111222"
+      }
+    },
+    vaccinations: [
+      "Flu"
+    ]
+  },
+  {
+    id: "74639185918",
+    date: dayPlus7,
+    time: "11:05",
+    patient: {
+      nhsNumber: "9111000028",
+      firstName: "Joy",
+      lastName: "Baker",
+      dateOfBirth: "1974-10-01",
+      contactDetails: {
+        email: "joy.baker@outlook.com"
+      }
+    },
+    vaccinations: [
+      "RSV"
+    ]
+  },
+  {
+    id: "74639185919",
+    date: dayPlus7,
+    time: "13:15",
+    patient: {
+      nhsNumber: "9111000029",
+      firstName: "Ray",
+      lastName: "Holland",
+      dateOfBirth: "1958-09-14",
+      contactDetails: {
+        mobile: "07577111333"
+      }
+    },
+    vaccinations: [
+      "Flu",
+      "COVID-19"
+    ]
+  },
+  {
+    id: "74639185920",
+    date: dayPlus7,
+    time: "14:50",
+    patient: {
+      nhsNumber: "9111000030",
+      firstName: "Holly",
+      lastName: "Lane",
+      dateOfBirth: "1995-11-26",
+      contactDetails: {
+        email: "holly.lane@gmail.com"
+      }
+    },
+    vaccinations: [
+      "COVID-19"
+    ]
+  }
+]
diff --git a/app/data/session-data-defaults.js b/app/data/session-data-defaults.js
index c0027bf0..53a33eff 100644
--- a/app/data/session-data-defaults.js
+++ b/app/data/session-data-defaults.js
@@ -1,4 +1,5 @@
 const allOrganisations = require('./all-organisations')
+const appointments = require('./appointments')
 const featureFlags = require('./feature-flags')
 const organisations = require('./organisations')
 const users = require('./users')
@@ -13,10 +14,11 @@ module.exports = {
   users: users,
   vaccines: vaccines,
   vaccineStock: vaccineStock,
+  appointments: appointments,
   lists: [],
   nhsNumberKnown: "yes",
-  currentUserId: "2387441662601",
-  currentOrganisationId: "RW3",
+  currentUserId: "46436346", // Jeremy Blue
+  currentOrganisationId: "FA424", // Pickfords Pharmacy
   vaccinationsRecorded: vaccinationsRecorded,
 
   // These are the options for extracting CSV reports
diff --git a/app/data/users.js b/app/data/users.js
index f3b4d98c..fd68212d 100644
--- a/app/data/users.js
+++ b/app/data/users.js
@@ -116,14 +116,14 @@ module.exports = [
     "firstName": "Paulina",
     "lastName": "Sloan"
   },
-  // Each pharmacy in Paulina Sloan’s chain has its own vaccinator
+  // Each pharmacy in Paulina Sloan’s chain has its own vaccinator, some of who are also admins
   {
     "id": "46436346",
     "email": "jeremy.blue@nhs.net",
     "organisations": [
       {
         "id": "FA424",
-        "permissionLevel": "Recorder",
+        "permissionLevel": "Lead administrator",
         "status": "Active",
         "vaccinator": true
       }
diff --git a/app/data/vaccine-stock.js b/app/data/vaccine-stock.js
index 32927538..f703deed 100644
--- a/app/data/vaccine-stock.js
+++ b/app/data/vaccine-stock.js
@@ -409,6 +409,34 @@ module.exports = [
       }
     ]
   },
+  {
+    id: "7436323",
+    vaccine: "Flu",
+    vaccineProduct: "Adjuvanted Trivalent Influenza Vaccine (aTIV)",
+    organisationId: "FA424", // Pickfords Pharmacy
+    siteId: "FA424X", // Pickfords Pharmacy
+    batches: [
+      {
+        id: "464735235325",
+        batchNumber: "714-14",
+        expiryDate: "2026-12-14"
+      }
+    ]
+  },
+  {
+    id: "9235235325",
+    vaccine: "COVID-19",
+    vaccineProduct: "Comirnaty 3 LP.8.1",
+    organisationId: "FA424", // Pickfords Pharmacy
+    siteId: "FA424X", // Pickfords Pharmacy
+    batches: [
+      {
+        id: "82725252",
+        batchNumber: "AB-255",
+        expiryDate: "2027-01-22"
+      }
+    ]
+  },
   {
     id: "2514771",
     vaccine: "flu (London service)",
diff --git a/app/filters.js b/app/filters.js
index ce8b19fc..dd43b8b3 100644
--- a/app/filters.js
+++ b/app/filters.js
@@ -18,9 +18,10 @@ module.exports = function () {
 
   filters.findById = findById
 
-  filters.dayName = function(isoDate) {
+  filters.dayName = function(isoDate, style = 'short') {
     const date = new Date(Date.parse(isoDate))
-    const dateFormatter = new Intl.DateTimeFormat('en-GB', {weekday: 'short'});
+    const weekdayStyle = (style === 'long') ? 'long' : 'short'
+    const dateFormatter = new Intl.DateTimeFormat('en-GB', {weekday: weekdayStyle});
 
     return dateFormatter.format(date)
   }
diff --git a/app/routes.js b/app/routes.js
index db5607e4..dd32140b 100644
--- a/app/routes.js
+++ b/app/routes.js
@@ -43,6 +43,7 @@ router.use('/regions{*splat}', authorise({userType: 'regional'}))
 router.use('/support{*splat}', authorise({userType: 'admin'}))
 
 require('./routes/apply')(router)
+require('./routes/appointments')(router)
 require('./routes/record-vaccinations')(router)
 require('./routes/regions')(router)
 require('./routes/user-admin')(router)
diff --git a/app/routes/appointments.js b/app/routes/appointments.js
new file mode 100644
index 00000000..2038fabd
--- /dev/null
+++ b/app/routes/appointments.js
@@ -0,0 +1,74 @@
+module.exports = (router) => {
+
+  router.get('/appointments', (req, res) => {
+    const data = req.session.data
+
+    const day = 86400000 // number of milliseconds in a day
+    const toDateString = (offsetDays = 0) => (new Date(Date.now() + (offsetDays * day))).toISOString().substring(0,10)
+    const today = toDateString()
+    const yesterday = toDateString(-1)
+    const tomorrow = toDateString(1)
+    const maxFutureDay = toDateString(7)
+    const requestedDay = req.query.date
+    const allowedDays = [yesterday, today]
+
+    for (let futureDayOffset = 1; futureDayOffset <= 7; futureDayOffset++) {
+      allowedDays.push(toDateString(futureDayOffset))
+    }
+
+    if (requestedDay && !allowedDays.includes(requestedDay)) {
+      return res.redirect('/appointments')
+    }
+
+    const currentDay = requestedDay || today
+    const currentDate = new Date(currentDay)
+    const previousDay = (new Date(currentDate.getTime() - day)).toISOString().substring(0,10)
+    const nextDay = (new Date(currentDate.getTime() + day)).toISOString().substring(0,10)
+    const isYesterday = currentDay === yesterday
+    const isMaxFutureDay = currentDay === maxFutureDay
+
+    let appointments = data.appointments
+
+    if (currentDay === today) {
+      appointments = appointments.filter((appointment) => appointment.date === "today" || appointment.date === today)
+    } else if (currentDay === yesterday) {
+      appointments = appointments.filter((appointment) => appointment.date === "yesterday" || appointment.date === yesterday)
+    } else if (currentDay === tomorrow) {
+      appointments = appointments.filter((appointment) => appointment.date === "tomorrow" || appointment.date === tomorrow)
+    } else {
+      appointments = appointments.filter((appointment) => appointment.date === currentDay)
+    }
+
+    const scheduledAppointments = appointments.filter((appointment) => !appointment.cancelled && (appointment.vaccinationIds || []).length === 0)
+
+    const cancelledAppointments = appointments.filter((appointment) => appointment.cancelled)
+
+    const completedAppointments = appointments.filter((appointment) => (appointment.vaccinationIds || []).length > 0)
+
+    let vaccinators = []
+
+    if (data.vaccinatorIds) {
+      vaccinators = data.users.filter((user) => data.vaccinatorIds.includes(user.id))
+    }
+
+
+    res.render('appointments/index', {
+      scheduledAppointments,
+      cancelledAppointments,
+      completedAppointments,
+      today,
+      currentDay,
+      previousDay,
+      nextDay,
+      isYesterday,
+      isMaxFutureDay,
+      vaccinators
+    })
+  })
+
+
+  router.get('/appointments/vaccinators', (req, res) => {
+    res.redirect('/appointments')
+  })
+}
+
diff --git a/app/routes/record-vaccinations.js b/app/routes/record-vaccinations.js
index 5de6bd4c..b253cb03 100644
--- a/app/routes/record-vaccinations.js
+++ b/app/routes/record-vaccinations.js
@@ -53,12 +53,33 @@ module.exports = router => {
     })
   })
 
+  router.get('/record-vaccinations/vaccination-date', (req, res) => {
+
+    const data = req.session.data
+    const appointmentId = data.appointmentId
+
+    if (appointmentId) {
+      const appointment = data.appointments.find((appointment) => appointment.id === appointmentId)
+
+      if (appointment.date === "today") {
+        // Set vaccination date to today and skip question
+        req.session.data.vaccinationToday = "yes"
+        return res.redirect('/record-vaccinations/delivery-team')
+
+      }
+    }
+
+    res.render('record-vaccinations/vaccination-date')
+  })
+
   router.post('/record-vaccinations/answer-date', (req, res) => {
     const data = req.session.data
 
     if (!data.vaccinationToday) {
       return res.redirect('/record-vaccinations/?showErrors=yes')
     }
+
+
     res.redirect('/record-vaccinations/delivery-team')
   })
 
@@ -72,6 +93,12 @@ module.exports = router => {
 
     const sitesInUse = currentOrganisation.sites.filter((site) => siteIdsWithVaccines.includes(site.id))
 
+    // If there’s only 1 site set up (eg a pharmacy), then
+    // set that and skip this question.
+    if (sitesInUse.length === 1) {
+      data.siteId = sitesInUse[0].id
+      return res.redirect('/record-vaccinations/vaccinator')
+    }
 
     if (req.query.showErrors === "yes") {
       if (!req.session.data.siteId) {
@@ -127,6 +154,14 @@ module.exports = router => {
       }
     }
 
+    // If we’re recording a vaccination from today’s appointments, and there’s
+    // only 1 vaccinator set as present, then set them as the vaccinator
+    // and skip the question.
+    if (data.appointmentId && Array.isArray(data.vaccinatorIds) && data.vaccinatorIds.length == 1) {
+      req.session.data.vaccinatorId = data.vaccinatorIds[0]
+      return res.redirect('/record-vaccinations/vaccine')
+    }
+
     res.render('record-vaccinations/vaccinator', {
       vaccinatorError,
       otherVaccinators
@@ -598,6 +633,7 @@ module.exports = router => {
     const yearToday = (dateToday.getFullYear())
 
     if (data.vaccinationToday === 'yes') {
+      data.vaccinationDate = {}
       data.vaccinationDate.day = String(dayToday)
       data.vaccinationDate.month = String(monthToday)
       data.vaccinationDate.year = String(yearToday)
@@ -627,6 +663,16 @@ module.exports = router => {
 
     data.lastAddedVaccinationId = generatedId
 
+    // Add the vaccination ID to the appointment so that
+    // we can filter the appointments list by which ones have
+    // been given
+    if (data.appointmentId) {
+      const appointment = data.appointments.find((appointment) => appointment.id == data.appointmentId)
+
+      appointment.vaccinationIds ||= []
+      appointment.vaccinationIds.push(generatedId)
+    }
+
     res.redirect('/record-vaccinations/done')
   })
 
@@ -716,6 +762,7 @@ module.exports = router => {
     }
 
     if (answer === 'same-vaccination-another-patient') {
+      data.appointmentId = ""
 
       req.session.data.firstName = ""
       req.session.data.lastName = ""
@@ -741,6 +788,7 @@ module.exports = router => {
       res.redirect('/record-vaccinations/patient-history?repeatPatient=yes&repeatVaccination=no')
 
     } else if (answer === 'different-vaccination-another-patient') {
+      data.appointmentId = ""
 
       req.session.data.vaccine = ""
       req.session.data.vaccineProduct = ""
@@ -751,6 +799,22 @@ module.exports = router => {
       req.session.data.vaccineDose = ""
 
       res.redirect('/record-vaccinations/?repeatPatient=no&repeatVaccination=no')
+
+    } else if (answer === 'appointments') {
+      data.appointmentId = ""
+
+      req.session.data.vaccine = ""
+      req.session.data.vaccineProduct = ""
+      req.session.data.vaccineBatch = ""
+      req.session.data.eligibility = ""
+      req.session.data.nhsNumber = ""
+      req.session.data.healthcareWorker = ""
+      req.session.data.vaccineDose = ""
+      req.session.data.vaccinationToday = ""
+      req.session.data.vaccinatorId = ""
+
+      res.redirect('/appointments')
+
     } else {
       res.redirect('/record-vaccinations/done?showErrors=yes')
     }
diff --git a/app/views/appointments/_cancelled.html b/app/views/appointments/_cancelled.html
new file mode 100644
index 00000000..c6066cd1
--- /dev/null
+++ b/app/views/appointments/_cancelled.html
@@ -0,0 +1,51 @@
+<table class="nhsuk-table-responsive" role="table" data-module="nhsuk-table">
+  <thead class="nhsuk-table__head" role="rowgroup">
+    <tr>
+      <th scope="col" class="nhsuk-table__header" aria-sort="ascending">Time</th>
+      <th scope="col" class="nhsuk-table__header" aria-sort="none">Name and NHS number</th>
+      <th scope="col" class="nhsuk-table__header">Date of birth</th>
+      <th scope="col" class="nhsuk-table__header">Vaccines booked</th>
+
+      <th scope="col" class="nhsuk-table__header">Contact details</th>
+      <th scope="col" class="nhsuk-table__header">Cancellation reason</th>
+    </tr>
+  </thead>
+  <tbody class="nhsuk-table__body">
+
+  {% for appointment in cancelledAppointments %}
+    <tr class="nhsuk-table__row" role="row">
+      <td class="nhsuk-table__cell" data-value="{{ appointment.time }}">{{ appointment.time }}am</td>
+      <td class="nhsuk-table__cell">
+        {{ appointment.patient.firstName }}
+        {{ appointment.patient.lastName }}
+        <div class="nhsuk-u-secondary-text-colour">{{ appointment.patient.nhsNumber | formatNhsNumber }}</div>
+      </td>
+      <td class="nhsuk-table__cell">
+        {{ appointment.patient.dateOfBirth | govukDate }}
+        <div class="nhsuk-u-secondary-text-colour">{{ appointment.patient.dateOfBirth | age }} old</div>
+      </td>
+      <td class="nhsuk-table__cell">
+        {{ appointment.vaccinations | join(", ") }}
+      </td>
+
+      <td class="nhsuk-table__cell nhsuk-u-text-break-word">
+        {% if appointment.patient.contactDetails.mobile %}
+          {{ appointment.patient.contactDetails.mobile }}<br>
+        {% endif %}
+        {% if appointment.patient.contactDetails.email %}
+          {{ appointment.patient.contactDetails.email }}<br>
+        {% endif %}
+      </td>
+      <td class="nhsuk-table__cell">
+        {% if appointment.cancelled.reason == "patient" %}
+          By patient
+        {% elif appointment.cancelled.reason == "organisation" %}
+          By site
+        {% elif appointment.cancelled.reason == "auto" %}
+          Already vaccinated
+        {% endif %}
+      </td>
+    </tr>
+  {% endfor %}
+  </tbody>
+</table>
diff --git a/app/views/appointments/_completed.html b/app/views/appointments/_completed.html
new file mode 100644
index 00000000..fe20d78e
--- /dev/null
+++ b/app/views/appointments/_completed.html
@@ -0,0 +1,40 @@
+<table class="nhsuk-table-responsive" role="table" data-module="nhsuk-table">
+  <thead class="nhsuk-table__head" role="rowgroup">
+    <tr>
+      <th scope="col" class="nhsuk-table__header" aria-sort="ascending">Time</th>
+      <th scope="col" class="nhsuk-table__header" aria-sort="none">Name and NHS number</th>
+      <th scope="col" class="nhsuk-table__header">Date of birth</th>
+      <th scope="col" class="nhsuk-table__header">Vaccines booked</th>
+      <th scope="col" class="nhsuk-table__header">Contact details</th>
+
+    </tr>
+  </thead>
+  <tbody class="nhsuk-table__body">
+
+  {% for appointment in completedAppointments %}
+    <tr class="nhsuk-table__row" role="row">
+      <td class="nhsuk-table__cell" data-value="{{ appointment.time }}">{{ appointment.time }}am</td>
+      <td class="nhsuk-table__cell">
+        {{ appointment.patient.firstName }}
+        {{ appointment.patient.lastName }}
+        <div class="nhsuk-u-secondary-text-colour">{{ appointment.patient.nhsNumber | formatNhsNumber }}</div>
+      </td>
+      <td class="nhsuk-table__cell">
+        {{ appointment.patient.dateOfBirth | govukDate }}
+        <div class="nhsuk-u-secondary-text-colour">{{ appointment.patient.dateOfBirth | age }} old</div>
+      </td>
+      <td class="nhsuk-table__cell">
+        {{ appointment.vaccinations | join("<br>") | safe }}
+      </td>
+      <td class="nhsuk-table__cell nhsuk-u-text-break-word">
+        {% if appointment.patient.contactDetails.mobile %}
+          {{ appointment.patient.contactDetails.mobile }}<br>
+        {% endif %}
+        {% if appointment.patient.contactDetails.email %}
+          {{ appointment.patient.contactDetails.email }}<br>
+        {% endif %}
+      </td>
+    </tr>
+  {% endfor %}
+  </tbody>
+</table>
diff --git a/app/views/appointments/_scheduled.html b/app/views/appointments/_scheduled.html
new file mode 100644
index 00000000..d18fbe84
--- /dev/null
+++ b/app/views/appointments/_scheduled.html
@@ -0,0 +1,49 @@
+<table class="nhsuk-table-responsive" role="table" data-module="nhsuk-table">
+  <thead class="nhsuk-table__head" role="rowgroup">
+    <tr>
+      <th scope="col" class="nhsuk-table__header" aria-sort="ascending">Time</th>
+      <th scope="col" class="nhsuk-table__header" aria-sort="none">Name and NHS number</th>
+      <th scope="col" class="nhsuk-table__header">Date of birth</th>
+      <th scope="col" class="nhsuk-table__header">Vaccines booked</th>
+      <th scope="col" class="nhsuk-table__header">Contact details</th>
+
+      {% if currentDay == today %}
+        <th scope="col" class="nhsuk-table__header">Action</th>
+      {% endif %}
+
+    </tr>
+  </thead>
+  <tbody class="nhsuk-table__body">
+
+  {% for appointment in scheduledAppointments %}
+    <tr class="nhsuk-table__row" role="row">
+      <td class="nhsuk-table__cell" data-value="{{ appointment.time }}">{{ appointment.time }}am</td>
+      <td class="nhsuk-table__cell">
+        {{ appointment.patient.firstName }}
+        {{ appointment.patient.lastName }}
+        <div class="nhsuk-u-secondary-text-colour">{{ appointment.patient.nhsNumber | formatNhsNumber }}</div>
+      </td>
+      <td class="nhsuk-table__cell">
+        {{ appointment.patient.dateOfBirth | govukDate }}
+        <div class="nhsuk-u-secondary-text-colour">{{ appointment.patient.dateOfBirth | age }} old</div>
+      </td>
+      <td class="nhsuk-table__cell">
+        {{ appointment.vaccinations | join("<br>") | safe }}
+      </td>
+      <td class="nhsuk-table__cell nhsuk-u-text-break-word">
+        {% if appointment.patient.contactDetails.mobile %}
+          {{ appointment.patient.contactDetails.mobile }}<br>
+        {% endif %}
+        {% if appointment.patient.contactDetails.email %}
+          {{ appointment.patient.contactDetails.email }}<br>
+        {% endif %}
+      </td>
+      {% if currentDay == today %}
+        <td class="nhsuk-table__cell">
+          <a href="/record-vaccinations/patient-history?nhsNumber={{ appointment.patient.nhsNumber }}&dateOfBirth={{ appointment.patient.dateOfBirth }}&firstName={{ appointment.patient.firstName }}&lastName={{ appointment.patient.lastName }}&from=appointments&appointmentId={{ appointment.id}}">Record<span class="nhsuk-u-visually-hidden"> vaccination for {{ appointment.patient.firstName }} {{ appointment.patient.lastName }}</span></a>
+        </td>
+      {% endif %}
+    </tr>
+  {% endfor %}
+  </tbody>
+</table>
diff --git a/app/views/appointments/index.html b/app/views/appointments/index.html
new file mode 100644
index 00000000..a900e23f
--- /dev/null
+++ b/app/views/appointments/index.html
@@ -0,0 +1,87 @@
+{% extends 'layout.html' %}
+
+{% if currentDay == today %}
+  {% set pageName = "Today’s appointments" %}
+{% elif nextDay == today %}
+  {% set pageName = "Yesterday’s appointments" %}
+{% elif previousDay == today %}
+  {% set pageName = "Tomorrow’s appointments" %}
+{% else %}
+  {% set pageName = "Appointments" %}
+{% endif %}
+{% set currentSection = "appointments" %}
+
+
+{% block content %}
+  <div class="nhsuk-grid-row">
+    <div class="nhsuk-grid-column-two-thirds">
+
+      <h1 class="nhsuk-heading-l">{{ pageName }}</h1>
+      <span class="nhsuk-caption-m">{{ currentDay | dayName('long') }}</span>
+      <h2 class="nhsuk-heading-m">{{ currentDay | formatDate }}</h2>
+      
+      
+
+      <p>Imported from <b>Manage your appointments</b></p>
+
+    </div>
+  </div>
+  <div class="nhsuk-grid-row">
+    <div class="nhsuk-grid-column-full">
+
+      {{ pagination({
+        previous: {
+          labelText: ("Yesterday" if currentDay == today else (previousDay | formatDate)),
+          href: "/appointments?date=" + previousDay
+        } if not isYesterday,
+        next: {
+          labelText: ("Tomorrow" if currentDay == today else (nextDay | formatDate)),
+          href: "/appointments?date=" + nextDay
+        } if not isMaxFutureDay
+      }) }}
+
+      {% set todayHtml %}
+        {% include "appointments/_scheduled.html" %}
+      {% endset %}
+
+      {% set cancelledHtml %}
+        {% include "appointments/_cancelled.html" %}
+      {% endset %}
+
+      {% set vaccinationsGivenHtml %}
+        {% include "appointments/_completed.html" %}
+      {% endset %}
+
+
+      {{ tabs({
+        items: [
+        {
+          label: "Scheduled (" + (scheduledAppointments | length) + ")",
+          id: "scheduled",
+          panel: {
+            html: todayHtml
+            }
+          },
+          {
+            label: "Completed (" + (completedAppointments | length) + ")",
+            id: "done",
+            panel: {
+              html: vaccinationsGivenHtml
+            }
+          } if currentDay <= today,
+          {
+            label: "Cancelled (" + (cancelledAppointments | length) + ")",
+            id: "cancelled",
+            panel: {
+              html: cancelledHtml
+            }
+          }
+        ]
+      }) }}
+
+
+    </div>
+  </div>
+
+
+{% endblock %}
diff --git a/app/views/appointments/vaccinators.html b/app/views/appointments/vaccinators.html
new file mode 100644
index 00000000..04a50559
--- /dev/null
+++ b/app/views/appointments/vaccinators.html
@@ -0,0 +1,62 @@
+{% extends 'layout.html' %}
+
+{% set currentSection = "appointments" %}
+{% set pageName = "Who is vaccinating today?" %}
+{% set organisationSetting = currentUser.organisations | findById(data.currentOrganisationId) %}
+
+{% block beforeContent %}
+  {{ backLink({
+    href: "/appointments",
+    text: "Back"
+  }) }}
+{% endblock%}
+
+{% block content %}
+  <div class="nhsuk-grid-row">
+    <div class="nhsuk-grid-column-two-thirds">
+
+      <form action="/appointments" method="post" novalidate>
+
+        {% set items = [] %}
+
+        {% if organisationSetting.vaccinator %}
+          {% set items = (items.push({
+            value: data.currentUserId,
+            text: "Me (" + currentUser.firstName + " " + currentUser.lastName + ")"
+          }), items) %}
+        {% endif %}
+
+        {% for user in otherVaccinators %}
+          {% set items = (items.push({
+            value: user.id,
+            text: user.firstName + " " + user.lastName + " (" + user.email + ")"
+          }), items) %}
+        {% endfor %}
+
+        {{ checkboxes({
+          idPrefix: "vaccinator",
+          name: "vaccinatorIds",
+          fieldset: {
+            legend: {
+              text: pageName,
+              size: "l",
+              isPageHeading: "true"
+            }
+          },
+          hint: {
+            text: "Setting this lets you save time when recording today’s vaccinations."
+          },
+          items: items,
+          values: data.vaccinatorIds
+        }) }}
+
+        {{ button({
+          text: "Continue"
+        })}}
+      </form>
+
+    </div>
+  </div>
+
+
+{% endblock %}
diff --git a/app/views/auth/okta-sign-in.html b/app/views/auth/okta-sign-in.html
index 0b913e3a..482f9eda 100644
--- a/app/views/auth/okta-sign-in.html
+++ b/app/views/auth/okta-sign-in.html
@@ -35,6 +35,7 @@ <h2 class="nhsuk-heading-s">Testing area</h2>
     <ul>
       <li><a href="#" data-email="jane.smith@nhs.net" data-module="prefill-email">Lead admin for an NHS trust (multiple sites set up)</a></li>
       <li><a href="#" data-email="henry.blue@nhs.net" data-module="prefill-email">Lead admin for an NHS trust (no vaccines set up)</a></li>
+      <li><a href="#" data-email="jeremy.blue@nhs.net" data-module="prefill-email">Lead admin for a single pharmacy</a></li>
       <li><a href="#" data-email="ocean.merritt@nhs.net" data-module="prefill-email">Recorder for an NHS trust</a></li>
       <li><a href="#" data-email="graham.wallace@nhs.net" data-module="prefill-email">Recorder for multiple NHS trusts</a></li>
       <li><a href="#" data-email="phoebe.black@nhs.net" data-module="prefill-email">Admin at 2 NHS trusts</a></li>
diff --git a/app/views/includes/header.html b/app/views/includes/header.html
index 7b92876d..6c7e1a3e 100644
--- a/app/views/includes/header.html
+++ b/app/views/includes/header.html
@@ -12,6 +12,12 @@
   }), navigationItems) %}
 
   {% if currentOrganisation %}
+    {% set navigationItems = (navigationItems.push({
+      href: "/appointments",
+      html: "Appointments <span class=\"nhsuk-tag app-tag--header nhsuk-u-margin-left-2\">New</span>",
+      active: (currentSection == "appointments")
+    }), navigationItems) %}
+
     {% set navigationItems = (navigationItems.push({
       href: "/record-vaccinations",
       text: "Record vaccinations",
diff --git a/app/views/record-vaccinations/check.html b/app/views/record-vaccinations/check.html
index ed543663..6806f10e 100644
--- a/app/views/record-vaccinations/check.html
+++ b/app/views/record-vaccinations/check.html
@@ -61,6 +61,7 @@
       <h1 class="nhsuk-heading-l">Check and confirm</h1>
 
       <h2 class="nhsuk-heading-m">Patient</h2>
+
       {{ summaryList({
         rows: [
           {
@@ -85,7 +86,7 @@ <h2 class="nhsuk-heading-m">Patient</h2>
               text: "Date of birth"
             },
             value: {
-              html: (data.dateOfBirth | isoDateFromDateInput | govukDate) + "<br>(76 years old)"
+              html: (data.dateOfBirth | formatDate) + "<br>(76 years old)"
             },
             actions: {
               items: [
diff --git a/app/views/record-vaccinations/done.html b/app/views/record-vaccinations/done.html
index d29d09e4..5d6946e5 100644
--- a/app/views/record-vaccinations/done.html
+++ b/app/views/record-vaccinations/done.html
@@ -51,13 +51,18 @@
           text: lowercaseVaccineName + " vaccination for another patient"
         }), items) %}
 
+        {% set items = (items.push({
+          value: "different-vaccination-another-patient",
+          text: "A different vaccination for another patient"
+        }), items) %}
+
         {% set items = (items.push({
           divider: "or"
         }), items) %}
 
         {% set items = (items.push({
-          value: "different-vaccination-another-patient",
-          text: "A different vaccination for another patient"
+          value: "appointments",
+          text: "Go to appointments list"
         }), items) %}
 
         {{ radios({
@@ -75,9 +80,14 @@
           items: items
         }) }}
 
-        {{ button({
-          text: "Continue"
-        })}}
+        <div class="nhsuk-button-group">
+          {{ button({
+            text: "Continue"
+          })}}
+
+          <p>or</p>
+          <a href="/home" class="nhsuk-link">Home</a>
+        </div>
       </form>
 
     </div>
diff --git a/app/views/record-vaccinations/index.html b/app/views/record-vaccinations/index.html
index cc3c523e..7c31616f 100644
--- a/app/views/record-vaccinations/index.html
+++ b/app/views/record-vaccinations/index.html
@@ -67,6 +67,9 @@
           ]
         }) }}
 
+        {# This is to make sure the right options are shown on the 'Done' page. #}
+        <input type="hidden" name="appointmentId" value="">
+
         {{ button({
           text: "Continue"
         })}}
diff --git a/app/views/record-vaccinations/patient-history.html b/app/views/record-vaccinations/patient-history.html
index 1eb54bde..cc002805 100644
--- a/app/views/record-vaccinations/patient-history.html
+++ b/app/views/record-vaccinations/patient-history.html
@@ -8,9 +8,10 @@
 {% set dateOfBirthHtml %}
   {% if data.dateOfBirth.day %}
     {{ (data.dateOfBirth | isoDateFromDateInput | govukDate) }}
-    <br>(76 years old)
+    <div class="nhsuk-u-secondary-text-colour">{{ data.dateOfBirth | isoDateFromDateInput | age }} old</div>
   {% else %}
     {{ (data.dateOfBirth | govukDate) }}
+    <div class="nhsuk-u-secondary-text-colour">{{ data.dateOfBirth | age }} old</div>
   {% endif %}
 {% endset %}
 
@@ -24,7 +25,9 @@
   {% set nextPage = "/record-vaccinations/vaccination-date" %}
 {% endif %}
 
-{% if data.repeatVaccination === "yes" %}
+{% if data.from == "appointments" %}
+  {% set previousPage = "/appointments" %}
+{% elseif data.repeatVaccination === "yes" %}
   {% set previousPage = "/record-vaccinations/patient" %}
 {% elseif data.repeatPatient === "yes" %}
   {% set previousPage = "/record-vaccinations/done" %}