From ce856d57a2a736b22e9cfd44977955eff897487e Mon Sep 17 00:00:00 2001 From: Frankie Roberto Date: Fri, 23 Jan 2026 15:00:19 +0000 Subject: [PATCH 1/4] Add appointments view --- app/views/appointments.html | 1313 ++++++++++++++++++++++++++++++++ app/views/includes/header.html | 6 + 2 files changed, 1319 insertions(+) create mode 100644 app/views/appointments.html diff --git a/app/views/appointments.html b/app/views/appointments.html new file mode 100644 index 00000000..5bd76e7a --- /dev/null +++ b/app/views/appointments.html @@ -0,0 +1,1313 @@ +{% extends 'layout.html' %} + +{% set pageName = "Today’s appointments" %} +{% set currentSection = "appointments" %} + + +{% block content %} +
+
+ +

{{ pageName }}

+ +

Imported from Manage your appointments.

+ + {% set todayContent %} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
TimeName and NHS numberDate of birthContact detailsServiceAction
9:30 amKeith Napkin
534 489 28161		10 January 1998 + + +

07506049635

+ + + 		Flu 18-64Record
9:40 amLynn Feather
751 850 88552		25 September 2004 + + +

07950161353

+ + + 		Flu 18-64Record
9:50 amCliff Sugarbowl
698 455 21065		21 December 1961 + + +

07567976511

+ + + 		COVID and Flu 18-64Record
10:00 amAlan Teapot
823 936 81939		16 April 1969 + + +

07588547704

+ + +

alan.teapot@btinternet.com

+ + +

0111432626

+ + + 		COVID 18+Record
10:10 amLorna Biscuitbarrel
652 120 50986		17 August 1946 + + +

07710440128

+ + +

lorna.biscuitbarrel@icloud.com

+ + + 		COVID and Flu 65+Record
10:20 amMoira Packet
695 810 15754		14 April 1950 + + +

07240669762

+ + +

moira.packet38@btinternet.com

+ + +

0148073010

+ + + 		COVID and Flu 65+Record
10:30 amPeter Cabbage
598 088 77172		18 October 1970 + + +

07987145006

+ + +

peter.cabbage57@outlook.com

+ + +

0114499021

+ + + 		COVID and Flu 18-64Record
10:40 amArthur Pudding
416 036 78543		15 February 1992 + + +

07282639596

+ + +

arthur.pudding@outlook.com

+ + + 		COVID and Flu 18-64Record
10:50 amSue Umbrella
646 576 88737		18 August 1942 + + +

07326120481

+ + + 		Flu 65+Record
11:00 amClaire Biscuittin
543 256 07440		4 July 1933 + + +

07837337014

+ + +

0127388502

+ + + 		COVID and Flu 65+Record
11:10 amAnita Cheesegrater
550 992 95151		29 September 1947 + + +

07159422998

+ + + 		Flu 65+Record
11:20 amPatricia Carpet
605 550 53621		30 November 1970 + +

patricia.carpet@outlook.com

+ + + 		COVID and Flu 18-64Record
11:30 amTerence Flannel
554 085 51969		30 November 1931 + + +

07732385497

+ + +

terence.flannel@aol.com

+ + + 		Flu 65+Record
11:40 amJoan Curtainrod
830 548 67180		26 May 1992 + + +

07518723709

+ + + 		COVID and Flu 18-64Record
11:50 amAngela Curtain
552 509 65068		1 October 1997 + + +

07105844688

+ + +

angela.curtain@hotmail.com

+ + + 		COVID and Flu 18-64Record
12:00 pmAlan Muffin
764 578 14136		13 January 1984 + +

alan.muffin@yahoo.co.uk

+ + + 		Flu 18-64Record
12:10 pmNeville Shovel
634 088 56154		3 April 2005 + + +

07857918379

+ + + 		COVID and Flu 18-64Record
12:20 pmWayne Biscuittin
796 111 56795		30 October 1970 + + +

07546020705

+ + +

wayne.biscuittin@btinternet.com

+ + + 		Flu 18-64Record
12:30 pmTerry Thimble
440 092 25502		25 June 1947 + +

terry.thimble@outlook.com

+ + + 		COVID and Flu 65+Record
12:40 pmRenee Saltshaker
625 838 66360		1 September 1937 + +

renee.saltshaker@icloud.com

+ + + 		Flu 65+Record
12:50 pmLucy Biscuit
647 914 02568		1 February 1951 + + +

07551565282

+ + +

lucy.biscuit@icloud.com

+ + + 		COVID and Flu 65+Record
2:00 pmMalcolm Biscuitjar
722 170 15094		10 December 1931 + + Flu 65+Record
2:00 pmMalcolm Biscuitjar
722 170 15094		10 December 1931 + + Flu 65+Record
2:10 pmDennis Curtainrod
813 639 49763		27 March 1945 + + +

07355313512

+ + + 		COVID and Flu 65+Record
2:10 pmDennis Curtainrod
813 639 49763		27 March 1945 + + +

07355313512

+ + + 		COVID and Flu 65+Record
2:20 pmLaura Biscuit
500 103 25159		5 November 1945 + + +

07762754385

+ + + 		Flu 65+Record
2:20 pmLaura Biscuit
500 103 25159		5 November 1945 + + +

07762754385

+ + + 		Flu 65+Record
2:30 pmRicky Biscuittin
549 207 96709		27 April 2004 + + +

07246390868

+ + +

ricky.biscuittin@hotmail.com

+ + + 		Flu 18-64Record
2:30 pmRicky Biscuittin
549 207 96709		27 April 2004 + + +

07246390868

+ + +

ricky.biscuittin@hotmail.com

+ + + 		Flu 18-64Record
2:40 pmGavin Muffin
743 559 64101		20 January 1976 + + Flu 18-64Record
2:40 pmGavin Muffin
743 559 64101		20 January 1976 + + Flu 18-64Record
2:50 pmBetty Blanket
807 449 96071		12 February 1958 + + +

07306930446

+ + + 		COVID and Flu 65+Record
2:50 pmBetty Blanket
807 449 96071		12 February 1958 + + +

07306930446

+ + + 		COVID and Flu 65+Record
3:00 pmFallback 420
666 297 51522		12 October 1954 + + +

07432075107

+ + +

fallback29@outlook.com

+ + + 		COVID and Flu 65+Record
3:00 pmFallback 420
666 297 51522		12 October 1954 + + +

07432075107

+ + +

fallback29@outlook.com

+ + + 		COVID and Flu 65+Record
3:10 pmTed Blanket
641 674 40175		11 April 1937 + + +

07951444425

+ + +

ted.blanket@icloud.com

+ + + 		COVID and Flu 65+Record
3:10 pmTed Blanket
641 674 40175		11 April 1937 + + +

07951444425

+ + +

ted.blanket@icloud.com

+ + + 		COVID and Flu 65+Record
3:20 pmMaurice Applecart
492 665 35628		24 May 1942 + + +

07686070833

+ + +

maurice.applecart@aol.com

+ + +

0163234327

+ + + 		COVID 18+Record
3:20 pmMaurice Applecart
492 665 35628		24 May 1942 + + +

07686070833

+ + +

maurice.applecart@aol.com

+ + +

0163234327

+ + + 		COVID 18+Record
3:30 pmGertrude Porthole
665 815 30656		6 September 1948 + + +

07200561595

+ + +

gertrude.porthole@yahoo.co.uk

+ + + 		COVID 18+Record
3:30 pmGertrude Porthole
665 815 30656		6 September 1948 + + +

07200561595

+ + +

gertrude.porthole@yahoo.co.uk

+ + + 		COVID 18+Record
3:40 pmJeanette Biscuit
635 430 03443		24 May 2020 + + +

07938264833

+ + +

jeanette.biscuit@aol.com

+ + + 		COVID 18+Record
3:40 pmJeanette Biscuit
635 430 03443		24 May 2020 + + +

07938264833

+ + +

jeanette.biscuit@aol.com

+ + + 		COVID 18+Record
3:50 pmEddie Biscuitjar
775 926 88908		26 September 2003 + + +

07284762599

+ + +

eddie.biscuitjar@yahoo.co.uk

+ + + 		Flu 18-64Record
3:50 pmEddie Biscuitjar
775 926 88908		26 September 2003 + + +

07284762599

+ + +

eddie.biscuitjar@yahoo.co.uk

+ + + 		Flu 18-64Record
4:00 pmAgnes Mop
656 921 58254		22 December 1964 + + +

07852550050

+ + +

agnes.mop44@yahoo.co.uk

+ + + 		COVID and Flu 18-64Record
4:00 pmAgnes Mop
656 921 58254		22 December 1964 + + +

07852550050

+ + +

agnes.mop44@yahoo.co.uk

+ + + 		COVID and Flu 18-64Record
4:10 pmStephen Curtainrod
480 117 56439		28 April 1965 + + +

07396583512

+ + +

stephen.curtainrod@aol.com

+ + + 		COVID and Flu 18-64Record
4:10 pmStephen Curtainrod
480 117 56439		28 April 1965 + + +

07396583512

+ + +

stephen.curtainrod@aol.com

+ + + 		COVID and Flu 18-64Record
4:20 pmHelen Curtain
894 547 52263		25 July 1993 + + +

07149410376

+ + +

helen.curtain@outlook.com

+ + + 		COVID and Flu 18-64Record
4:20 pmHelen Curtain
894 547 52263		25 July 1993 + + +

07149410376

+ + +

helen.curtain@outlook.com

+ + + 		COVID and Flu 18-64Record
4:30 pmDenise Cloudberry
718 186 53238		27 February 2005 + + +

07279530526

+ + +

denise.cloudberry@yahoo.co.uk

+ + + 		Flu 18-64Record
4:30 pmDenise Cloudberry
718 186 53238		27 February 2005 + + +

07279530526

+ + +

denise.cloudberry@yahoo.co.uk

+ + + 		Flu 18-64Record
4:40 pmBrian Spatula
642 479 67687		24 March 1988 + + +

07153377152

+ + +

brian.spatula@hotmail.com

+ + + 		Flu 18-64Record
4:40 pmBrian Spatula
642 479 67687		24 March 1988 + + +

07153377152

+ + +

brian.spatula@hotmail.com

+ + + 		Flu 18-64Record
4:50 pmChloe Teacosy
719 976 59774		16 July 1984 + + +

07470501041

+ + +

chloe.teacosy@btinternet.com

+ + + 		Flu 18-64Record
4:50 pmChloe Teacosy
719 976 59774		16 July 1984 + + +

07470501041

+ + +

chloe.teacosy@btinternet.com

+ + + 		Flu 18-64Record
+ {% endset %} + + {{ tabs({ + items: [ + { + label: "Scheduled", + id: "scheduled", + panel: { + html: todayContent + } + }, + { + label: "Recordled", + id: "cancelled", + panel: { + html: "TODO" + } + }, + { + label: "Vaccinations given", + id: "done", + panel: { + html: "TODO" + } + } + ] + }) }} + + +
+
+ + +{% endblock %} diff --git a/app/views/includes/header.html b/app/views/includes/header.html index af2c9c64..9212b770 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 New", + active: (currentSection == "appointments") + }), navigationItems) %} + {% set navigationItems = (navigationItems.push({ href: "/record-vaccinations", text: "Record vaccinations", From 0b135fbe335096224e694869d89c9ebf743dfd96 Mon Sep 17 00:00:00 2001 From: Frankie Roberto Date: Fri, 23 Jan 2026 15:06:02 +0000 Subject: [PATCH 2/4] fix typo --- app/views/appointments.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/appointments.html b/app/views/appointments.html index 5bd76e7a..647f2454 100644 --- a/app/views/appointments.html +++ b/app/views/appointments.html @@ -1289,7 +1289,7 @@

{{ pageName }}

} }, { - label: "Recordled", + label: "Cancelled", id: "cancelled", panel: { html: "TODO" From 72b5284305ebb45e73110b150ea6a80f9a78a2a3 Mon Sep 17 00:00:00 2001 From: Frankie Roberto Date: Mon, 16 Mar 2026 11:30:01 +0000 Subject: [PATCH 3/4] Make appointments page more dynamic --- app/data/appointments.js | 130 ++ app/data/session-data-defaults.js | 2 + app/views/appointments.html | 1264 +---------------- .../record-vaccinations/patient-history.html | 4 +- 4 files changed, 158 insertions(+), 1242 deletions(-) create mode 100644 app/data/appointments.js diff --git a/app/data/appointments.js b/app/data/appointments.js new file mode 100644 index 00000000..657a52fd --- /dev/null +++ b/app/data/appointments.js @@ -0,0 +1,130 @@ +// These are organisations set up as using RAVS +module.exports = [ + + { + 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" + ] + }, + { + time: "10:30", + patient: { + nhsNumber: "9841414141", + firstName: "Keith", + lastName: "Napkin", + dateOfBirth: "1976-02-12", + contactDetails: { + mobile: "077345813941" + } + }, + vaccinations: [ + "COVID-19", + "Flu" + ] + }, + { + time: "10:40", + patient: { + nhsNumber: "9841515715", + firstName: "Lynn", + lastName: "Feather", + dateOfBirth: "1963-05-23", + contactDetails: { + email: "lynn.feather@gmail.com" + } + }, + vaccinations: [ + "Flu", "RSV" + ] + }, + { + time: "11:10", + patient: { + nhsNumber: "98357151513", + firstName: "Lorna", + lastName: "Biscuitbarrel", + dateOfBirth: "1962-08-19", + contactDetails: { + mobile: "07364824944" + } + }, + vaccinations: [ + "Flu" + ] + }, + { + time: "11:20", + patient: { + nhsNumber: "9847471413", + firstName: "Moira", + lastName: "Packet", + dateOfBirth: "1950-04-14", + contactDetails: { + mobile: "07623842424" + } + }, + vaccinations: [ + "COVID-19" + ] + }, + { + time: "11:30", + patient: { + nhsNumber: "9841411411", + firstName: "Cliff", + lastName: "Sugarbowl", + dateOfBirth: "1957-01-23", + contactDetails: { + mobile: "07623913141" + } + }, + vaccinations: [ + "COVID-19" + ] + }, + { + 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" + ] + }, + { + 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" + ] + } + +] diff --git a/app/data/session-data-defaults.js b/app/data/session-data-defaults.js index 63629e74..07407815 100644 --- a/app/data/session-data-defaults.js +++ b/app/data/session-data-defaults.js @@ -5,6 +5,7 @@ const users = require('./users') const vaccinationsRecorded = require('./vaccinations-recorded') const vaccineStock = require('./vaccine-stock') const vaccines = require('./vaccines') +const appointments = require('./appointments') module.exports = { organisations: organisations, @@ -13,6 +14,7 @@ module.exports = { users: users, vaccines: vaccines, vaccineStock: vaccineStock, + appointments: appointments, lists: [], nhsNumberKnown: "yes", currentUserId: "2387441662601", diff --git a/app/views/appointments.html b/app/views/appointments.html index 647f2454..058942e0 100644 --- a/app/views/appointments.html +++ b/app/views/appointments.html @@ -13,14 +13,15 @@

{{ pageName }}

Imported from Manage your appointments.

{% set todayContent %} - + +
- - + + - + @@ -28,1253 +29,34 @@

{{ pageName }}

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + {% for appointment in data.appointments %} - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + {% endfor %}
TimeName and NHS numberTimeName Date of birth Contact detailsServiceVaccines Action
9:30 amKeith Napkin
534 489 28161		10 January 1998 - - -

07506049635

- - - 		Flu 18-64Record
9:40 amLynn Feather
751 850 88552		25 September 2004 - - -

07950161353

- - - 		Flu 18-64Record
9:50 amCliff Sugarbowl
698 455 21065		21 December 1961 - - -

07567976511

- - - 		COVID and Flu 18-64Record
10:00 amAlan Teapot
823 936 81939		16 April 1969 - - -

07588547704

- - -

alan.teapot@btinternet.com

- - -

0111432626

- - - 		COVID 18+Record
10:10 amLorna Biscuitbarrel
652 120 50986		17 August 1946 - - -

07710440128

- - -

lorna.biscuitbarrel@icloud.com

- - - 		COVID and Flu 65+Record
10:20 amMoira Packet
695 810 15754		14 April 1950 - - -

07240669762

- - -

moira.packet38@btinternet.com

- - -

0148073010

- - - 		COVID and Flu 65+Record
10:30 amPeter Cabbage
598 088 77172		18 October 1970 - - -

07987145006

- - -

peter.cabbage57@outlook.com

- - -

0114499021

- - - 		COVID and Flu 18-64Record
10:40 amArthur Pudding
416 036 78543		15 February 1992 - - -

07282639596

- - -

arthur.pudding@outlook.com

- - - 		COVID and Flu 18-64Record
10:50 amSue Umbrella
646 576 88737		18 August 1942 - - -

07326120481

- - - 		Flu 65+Record
11:00 amClaire Biscuittin
543 256 07440		4 July 1933 - - -

07837337014

- - -

0127388502

- - - 		COVID and Flu 65+Record
11:10 amAnita Cheesegrater
550 992 95151		29 September 1947 - - -

07159422998

- - - 		Flu 65+Record
11:20 amPatricia Carpet
605 550 53621		30 November 1970 - -

patricia.carpet@outlook.com

- - - 		COVID and Flu 18-64Record
11:30 amTerence Flannel
554 085 51969		30 November 1931 - - -

07732385497

- - -

terence.flannel@aol.com

- - + 		{{ appointment.time }} am + {{ appointment.patient.firstName }} + {{ appointment.patient.lastName }} Flu 65+Record
11:40 amJoan Curtainrod
830 548 67180		26 May 1992 - - -

07518723709

- - + 		+ {{ appointment.patient.dateOfBirth | govukDate }} COVID and Flu 18-64Record
11:50 amAngela Curtain
552 509 65068		1 October 1997 - - -

07105844688

- - -

angela.curtain@hotmail.com

- - + {% if appointment.patient.contactDetails.mobile %} + {{ appointment.patient.contactDetails.mobile }}
+ {% endif %} + {% if appointment.patient.contactDetails.email %} + {{ appointment.patient.contactDetails.email }}
+ {% endif %} 		COVID and Flu 18-64Record
12:00 pmAlan Muffin
764 578 14136		13 January 1984 - -

alan.muffin@yahoo.co.uk

- - + 		+ {{ appointment.vaccinations | join(", ") }} Flu 18-64Record
12:10 pmNeville Shovel
634 088 56154		3 April 2005 - - -

07857918379

- - + 		+ Record COVID and Flu 18-64Record
12:20 pmWayne Biscuittin
796 111 56795		30 October 1970 - - -

07546020705

- - -

wayne.biscuittin@btinternet.com

- - - 		Flu 18-64Record
12:30 pmTerry Thimble
440 092 25502		25 June 1947 - -

terry.thimble@outlook.com

- - - 		COVID and Flu 65+Record
12:40 pmRenee Saltshaker
625 838 66360		1 September 1937 - -

renee.saltshaker@icloud.com

- - - 		Flu 65+Record
12:50 pmLucy Biscuit
647 914 02568		1 February 1951 - - -

07551565282

- - -

lucy.biscuit@icloud.com

- - - 		COVID and Flu 65+Record
2:00 pmMalcolm Biscuitjar
722 170 15094		10 December 1931 - - Flu 65+Record
2:00 pmMalcolm Biscuitjar
722 170 15094		10 December 1931 - - Flu 65+Record
2:10 pmDennis Curtainrod
813 639 49763		27 March 1945 - - -

07355313512

- - - 		COVID and Flu 65+Record
2:10 pmDennis Curtainrod
813 639 49763		27 March 1945 - - -

07355313512

- - - 		COVID and Flu 65+Record
2:20 pmLaura Biscuit
500 103 25159		5 November 1945 - - -

07762754385

- - - 		Flu 65+Record
2:20 pmLaura Biscuit
500 103 25159		5 November 1945 - - -

07762754385

- - - 		Flu 65+Record
2:30 pmRicky Biscuittin
549 207 96709		27 April 2004 - - -

07246390868

- - -

ricky.biscuittin@hotmail.com

- - - 		Flu 18-64Record
2:30 pmRicky Biscuittin
549 207 96709		27 April 2004 - - -

07246390868

- - -

ricky.biscuittin@hotmail.com

- - - 		Flu 18-64Record
2:40 pmGavin Muffin
743 559 64101		20 January 1976 - - Flu 18-64Record
2:40 pmGavin Muffin
743 559 64101		20 January 1976 - - Flu 18-64Record
2:50 pmBetty Blanket
807 449 96071		12 February 1958 - - -

07306930446

- - - 		COVID and Flu 65+Record
2:50 pmBetty Blanket
807 449 96071		12 February 1958 - - -

07306930446

- - - 		COVID and Flu 65+Record
3:00 pmFallback 420
666 297 51522		12 October 1954 - - -

07432075107

- - -

fallback29@outlook.com

- - - 		COVID and Flu 65+Record
3:00 pmFallback 420
666 297 51522		12 October 1954 - - -

07432075107

- - -

fallback29@outlook.com

- - - 		COVID and Flu 65+Record
3:10 pmTed Blanket
641 674 40175		11 April 1937 - - -

07951444425

- - -

ted.blanket@icloud.com

- - - 		COVID and Flu 65+Record
3:10 pmTed Blanket
641 674 40175		11 April 1937 - - -

07951444425

- - -

ted.blanket@icloud.com

- - - 		COVID and Flu 65+Record
3:20 pmMaurice Applecart
492 665 35628		24 May 1942 - - -

07686070833

- - -

maurice.applecart@aol.com

- - -

0163234327

- - - 		COVID 18+Record
3:20 pmMaurice Applecart
492 665 35628		24 May 1942 - - -

07686070833

- - -

maurice.applecart@aol.com

- - -

0163234327

- - - 		COVID 18+Record
3:30 pmGertrude Porthole
665 815 30656		6 September 1948 - - -

07200561595

- - -

gertrude.porthole@yahoo.co.uk

- - - 		COVID 18+Record
3:30 pmGertrude Porthole
665 815 30656		6 September 1948 - - -

07200561595

- - -

gertrude.porthole@yahoo.co.uk

- - - 		COVID 18+Record
3:40 pmJeanette Biscuit
635 430 03443		24 May 2020 - - -

07938264833

- - -

jeanette.biscuit@aol.com

- - - 		COVID 18+Record
3:40 pmJeanette Biscuit
635 430 03443		24 May 2020 - - -

07938264833

- - -

jeanette.biscuit@aol.com

- - - 		COVID 18+Record
3:50 pmEddie Biscuitjar
775 926 88908		26 September 2003 - - -

07284762599

- - -

eddie.biscuitjar@yahoo.co.uk

- - - 		Flu 18-64Record
3:50 pmEddie Biscuitjar
775 926 88908		26 September 2003 - - -

07284762599

- - -

eddie.biscuitjar@yahoo.co.uk

- - - 		Flu 18-64Record
4:00 pmAgnes Mop
656 921 58254		22 December 1964 - - -

07852550050

- - -

agnes.mop44@yahoo.co.uk

- - - 		COVID and Flu 18-64Record
4:00 pmAgnes Mop
656 921 58254		22 December 1964 - - -

07852550050

- - -

agnes.mop44@yahoo.co.uk

- - - 		COVID and Flu 18-64Record
4:10 pmStephen Curtainrod
480 117 56439		28 April 1965 - - -

07396583512

- - -

stephen.curtainrod@aol.com

- - - 		COVID and Flu 18-64Record
4:10 pmStephen Curtainrod
480 117 56439		28 April 1965 - - -

07396583512

- - -

stephen.curtainrod@aol.com

- - - 		COVID and Flu 18-64Record
4:20 pmHelen Curtain
894 547 52263		25 July 1993 - - -

07149410376

- - -

helen.curtain@outlook.com

- - - 		COVID and Flu 18-64Record
4:20 pmHelen Curtain
894 547 52263		25 July 1993 - - -

07149410376

- - -

helen.curtain@outlook.com

- - - 		COVID and Flu 18-64Record
4:30 pmDenise Cloudberry
718 186 53238		27 February 2005 - - -

07279530526

- - -

denise.cloudberry@yahoo.co.uk

- - - 		Flu 18-64Record
4:30 pmDenise Cloudberry
718 186 53238		27 February 2005 - - -

07279530526

- - -

denise.cloudberry@yahoo.co.uk

- - - 		Flu 18-64Record
4:40 pmBrian Spatula
642 479 67687		24 March 1988 - - -

07153377152

- - -

brian.spatula@hotmail.com

- - - 		Flu 18-64Record
4:40 pmBrian Spatula
642 479 67687		24 March 1988 - - -

07153377152

- - -

brian.spatula@hotmail.com

- - - 		Flu 18-64Record
4:50 pmChloe Teacosy
719 976 59774		16 July 1984 - - -

07470501041

- - -

chloe.teacosy@btinternet.com

- - - 		Flu 18-64Record
4:50 pmChloe Teacosy
719 976 59774		16 July 1984 - - -

07470501041

- - -

chloe.teacosy@btinternet.com

- - - 		Flu 18-64Record
{% endset %} diff --git a/app/views/record-vaccinations/patient-history.html b/app/views/record-vaccinations/patient-history.html index 2b5bb47b..e0ee8c06 100644 --- a/app/views/record-vaccinations/patient-history.html +++ b/app/views/record-vaccinations/patient-history.html @@ -24,7 +24,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" %} From b090a78b7e818b5ec6931e2060999a88ff9e681d Mon Sep 17 00:00:00 2001 From: Frankie Roberto Date: Mon, 16 Mar 2026 12:04:08 +0000 Subject: [PATCH 4/4] Code style fix --- app/data/session-data-defaults.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/data/session-data-defaults.js b/app/data/session-data-defaults.js index 07407815..cb2120a0 100644 --- a/app/data/session-data-defaults.js +++ b/app/data/session-data-defaults.js @@ -1,11 +1,11 @@ const allOrganisations = require('./all-organisations') +const appointments = require('./appointments') const featureFlags = require('./feature-flags') const organisations = require('./organisations') const users = require('./users') const vaccinationsRecorded = require('./vaccinations-recorded') const vaccineStock = require('./vaccine-stock') const vaccines = require('./vaccines') -const appointments = require('./appointments') module.exports = { organisations: organisations,