Skip to content

Commit 4d40d8c

Browse files
johnrimmer2johnrimmer2
committed
changes
1 parent b4035d4 commit 4d40d8c

File tree

8 files changed

+395
-7
lines changed

8 files changed

+395
-7
lines changed

‎app/views/includes/header-logged-in-region1.html‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
{% set organisationSetting = currentUser.organisations | findById(data.currentOrganisationId) %}
2+
3+
{{ header({
4+
classes: "nhsuk-header--left",
5+
"service": {
6+
"name": "Record a vaccination",
7+
"href": "/"
8+
},
9+
"showNav": "true",
10+
"showSearch": "false",
11+
"primaryLinks": [
12+
13+
{
14+
url: "/regions/v1/index1",
15+
label: "Organisations",
16+
classes: ("app-header__navigation-item--current" if currentSection == "organisations")
17+
} if (currentUser and (["Lead administrator", "Administrator"] | arrayOrStringIncludes(organisationSetting.permissionLevel))),
18+
19+
{
20+
url: '/regions/v1/add-organisation1',
21+
label: 'Invite',
22+
classes: ("app-header__navigation-item--current" if currentSection == "add-organisation")
23+
} if (currentUser and organisationSetting.permissionLevel === "Lead administrator"),
24+
25+
26+
{
27+
url: "/regions/v1/awaiting-approval1",
28+
label: "Awaiting approval (4)",
29+
classes: ("app-header__navigation-item--current" if currentSection == "awaiting-approval")
30+
} if (currentUser and (["Lead administrator", "Administrator"] | arrayOrStringIncludes(organisationSetting.permissionLevel))),
31+
32+
33+
34+
35+
{
36+
url: "/user-profile",
37+
label: currentUser.email,
38+
classes: "app-header__navigation-item--right-aligned " + ("app-header__navigation-item--current" if currentSection == "user-profile")
39+
},
40+
{
41+
url: '/sign-out',
42+
label: 'Log out'
43+
}
44+
] if data.currentUserId
45+
})
46+
}}

‎app/views/index.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ <h2>Regions interface</h2>
5050

5151
<ul>
5252
<li><a href="/regions/v1">Regions interface</a></li>
53+
<li><a href="/regions/v1/index1">Test interface</a></li>
5354
<li><a href="/regions/v1/onboarding0">Apply to RAVS</a></li>
5455
</ul>
5556

‎app/views/regions/v1/add-organisation1.html‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
{% extends 'layout.html' %}
2+
3+
{% block pageTitle %}
4+
East of England
5+
{% endblock %}
6+
7+
{% block header %}
8+
{% include "includes/header-logged-in-region1.html" %}
9+
{% endblock %}
10+
11+
{% set currentSection = "add-organisation" %}
12+
13+
{% block content %}
14+
<div class="nhsuk-grid-row">
15+
<div class="nhsuk-grid-column-two-thirds">
16+
17+
18+
<h1 class="nhsuk-heading-xl">Find an organisation to invite</h1>
19+
20+
<form action="/regions/v1/organisation-details" method="post">
21+
22+
<div class="nhsuk-form-group">
23+
<h1 class="nhsuk-label-wrapper">
24+
<label class="nhsuk-label nhsuk-label--m nhsuk-u-margin-bottom-1" for="organisationCode">
25+
NHS organisation or community pharmacy
26+
</label>
27+
</h1>
28+
<div class="nhsuk-hint" id="organisationName-hint">
29+
Search by name or ODS code
30+
</div>
31+
<select class="nhsuk-select" id="organisationCode" name="organisationCode"
32+
data-module="autocomplete" data-autoselect="" data-display-menu="" data-min-length="" data-show-all-values="" data-show-no-options-found="">
33+
<option selected value=""></option>
34+
35+
{% set options = [] %}
36+
37+
{% for code, name in data.nhsTrusts %}
38+
{% set options = (options.push({
39+
label: name + " (" + code + ")",
40+
value: code
41+
}), options) %}
42+
{% endfor %}
43+
44+
{% for code, data in data.nhsPharmacies %}
45+
{% set options = (options.push({
46+
label: data.name + ", " + data.address + ", " + (data.postcode | upper) + " (" + code + ")",
47+
value: code
48+
}), options) %}
49+
{% endfor %}
50+
51+
{% for option in (options | sort(false, true, "label")) %}
52+
<option value="{{ option.value }}">{{ option.label }}</option>
53+
{% endfor %}
54+
</select>
55+
</div>
56+
57+
{{ button({
58+
"text": "Continue"
59+
}) }}
60+
</form>
61+
62+
63+
</div>
64+
</div>
65+
{% endblock %}

‎app/views/regions/v1/awaiting-approval1.html‎

Lines changed: 144 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,144 @@
1+
{% extends 'layout.html' %}
2+
3+
{% block pageTitle %}
4+
East of England region
5+
{% endblock %}
6+
7+
{% block header %}
8+
{% include "includes/header-logged-in-region1.html" %}
9+
{% endblock %}
10+
11+
{% set currentSection = "awaiting-approval" %}
12+
13+
{% block content %}
14+
<div class="nhsuk-grid-row">
15+
<div class="nhsuk-grid-column-two-thirds">
16+
17+
<h1 class="nhsuk-heading-xl">Awaiting approval</h1>
18+
19+
</div>
20+
</div>
21+
<div class="nhsuk-grid-row">
22+
<div class="nhsuk-grid-column-full">
23+
24+
25+
26+
<table role="table" class="nhsuk-table-responsive">
27+
<thead role="rowgroup" class="nhsuk-table__head">
28+
<tr role="row">
29+
<th role="columnheader" class="" scope="col">
30+
Organisation
31+
</th>
32+
<th role="columnheader" class="" scope="col">
33+
ODS code
34+
</th>
35+
<th role="columnheader" class="" scope="col">
36+
Type
37+
</th>
38+
<th role="columnheader" class="" scope="col">
39+
Date requested
40+
</th>
41+
<th role="columnheader" class="" scope="col">
42+
43+
</th>
44+
<th role="columnheader" class="" scope="col">
45+
46+
</th>
47+
48+
</tr>
49+
</thead>
50+
<tbody class="nhsuk-table__body">
51+
<tr role="row" class="nhsuk-table__row">
52+
<td role="cell" class="nhsuk-table__cell">
53+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Organisation </span><a href="/regions/v1/organisation-request">Addlestone Pharmacy</a>
54+
</td>
55+
<td role="cell" class="nhsuk-table__cell">
56+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">ODS code </span>FAE02S
57+
</td>
58+
<td role="cell" class="nhsuk-table__cell">
59+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Type</span>NHS Trust
60+
</td>
61+
<td role="cell" class="nhsuk-table__cell">
62+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Date requested</span>4 April 2025
63+
</td>
64+
<td role="cell" class="nhsuk-table__cell">
65+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Organisation </span><a href="/regions/v1/accept">Approve</a>
66+
</td>
67+
<td role="cell" class="nhsuk-table__cell">
68+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Organisation </span><a href="/regions/v1/reject">Reject</a>
69+
</td>
70+
71+
</tr>
72+
</thead>
73+
<tbody class="nhsuk-table__body">
74+
<tr role="row" class="nhsuk-table__row">
75+
<td role="cell" class="nhsuk-table__cell">
76+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Organisation </span><a href="/regions/v1/organisation-request">Leeds Teaching Hospitals </a>
77+
</td>
78+
<td role="cell" class="nhsuk-table__cell">
79+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">ODS code </span>RR8
80+
</td>
81+
<td role="cell" class="nhsuk-table__cell">
82+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Type</span>NHS Trust
83+
</td>
84+
<td role="cell" class="nhsuk-table__cell">
85+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Date requested</span>3 April 2025
86+
</td>
87+
<td role="cell" class="nhsuk-table__cell">
88+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Organisation </span><a href="/regions/v1/accept">Approve</a>
89+
</td>
90+
<td role="cell" class="nhsuk-table__cell">
91+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Organisation </span><a href="/regions/v1/reject">Reject</a>
92+
</td>
93+
94+
95+
96+
</tr>
97+
<tr role="row" class="nhsuk-table__row">
98+
<td role="cell" class="nhsuk-table__cell">
99+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Organisation </span><a href="/regions/v1/organisation-request/{{ organisation.id }}">Apex Prime Care</a>
100+
</td>
101+
<td role="cell" class="nhsuk-table__cell">
102+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">ODS code</span>VN0J3
103+
</td>
104+
<td role="cell" class="nhsuk-table__cell">
105+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Type</span>NHS Trust
106+
</td>
107+
<td role="cell" class="nhsuk-table__cell">
108+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Date requested</span>1 April 2025
109+
</td>
110+
<td role="cell" class="nhsuk-table__cell">
111+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Organisation </span><a href="/regions/v1/accept">Approve</a>
112+
</td>
113+
<td role="cell" class="nhsuk-table__cell">
114+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Organisation </span><a href="/regions/v1/reject">Reject</a>
115+
</td>
116+
</tr>
117+
<tr role="row" class="nhsuk-table__row">
118+
<td role="cell" class="nhsuk-table__cell">
119+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Organisation </span><a href="/regions/v1/organisations/{{ organisation.id }}">Oxford Road Pharmacy</a>
120+
</td>
121+
<td role="cell" class="nhsuk-table__cell">
122+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">ODS code</span>PP34
123+
</td>
124+
<td role="cell" class="nhsuk-table__cell">
125+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Type</span>Community Pharmacy
126+
</td>
127+
<td role="cell" class="nhsuk-table__cell">
128+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Date requested</span>28 March 2025
129+
</td>
130+
<td role="cell" class="nhsuk-table__cell">
131+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Organisation </span><a href="/regions/v1/accept">Approve</a>
132+
</td>
133+
<td role="cell" class="nhsuk-table__cell">
134+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Organisation </span><a href="/regions/v1/reject">Reject</a>
135+
</td>
136+
137+
</tbody>
138+
</table>
139+
140+
</div>
141+
</div>
142+
143+
144+
{% endblock %}

‎app/views/regions/v1/index1.html‎

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
1+
{% extends 'layout.html' %}
2+
3+
{% block pageTitle %}
4+
East of England region
5+
{% endblock %}
6+
7+
{% block header %}
8+
{% include "includes/header-logged-in-region1.html" %}
9+
{% endblock %}
10+
11+
{% set currentSection = "organisations" %}
12+
13+
{% block content %}
14+
<div class="nhsuk-grid-row">
15+
<div class="nhsuk-grid-column-two-thirds">
16+
17+
<span class="nhsuk-caption-m">North West Commisioning Region</span>
18+
<h1 class="nhsuk-heading-xl">Organisations</h1>
19+
20+
21+
</div>
22+
</div>
23+
<div class="nhsuk-grid-row">
24+
<div class="nhsuk-grid-column-full">
25+
26+
27+
28+
<table role="table" class="nhsuk-table-responsive">
29+
<thead role="rowgroup" class="nhsuk-table__head">
30+
<tr role="row">
31+
<th role="columnheader" class="" scope="col">
32+
Organisation
33+
</th>
34+
<th role="columnheader" class="" scope="col">
35+
ODS code
36+
</th>
37+
<th role="columnheader" class="" scope="col">
38+
Type
39+
</th>
40+
<th role="columnheader" class="" scope="col">
41+
Status
42+
</th>
43+
44+
</tr>
45+
</thead>
46+
<tbody class="nhsuk-table__body">
47+
<tr role="row" class="nhsuk-table__row">
48+
<td role="cell" class="nhsuk-table__cell">
49+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Organisation </span><a href="/regions/v1/organisation-request">Addlestone Pharmacy</a>
50+
</td>
51+
<td role="cell" class="nhsuk-table__cell">
52+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">ODS code </span>FAE02S
53+
</td>
54+
<td role="cell" class="nhsuk-table__cell">
55+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Type</span>NHS Trust
56+
</td>
57+
<td role="cell" class="nhsuk-table__cell">
58+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Status</span>Active
59+
</td>
60+
61+
</tr>
62+
</thead>
63+
<tbody class="nhsuk-table__body">
64+
<tr role="row" class="nhsuk-table__row">
65+
<td role="cell" class="nhsuk-table__cell">
66+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Organisation </span><a href="/regions/v1/organisation-request">Leeds Teaching Hospitals </a>
67+
</td>
68+
<td role="cell" class="nhsuk-table__cell">
69+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">ODS code </span>RR8
70+
</td>
71+
<td role="cell" class="nhsuk-table__cell">
72+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Type</span>NHS Trust
73+
</td>
74+
<td role="cell" class="nhsuk-table__cell">
75+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Status</span>Active
76+
</td>
77+
78+
79+
80+
</tr>
81+
<tr role="row" class="nhsuk-table__row">
82+
<td role="cell" class="nhsuk-table__cell">
83+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Organisation </span><a href="/regions/v1/organisation-request/{{ organisation.id }}">Apex Prime Care</a>
84+
</td>
85+
<td role="cell" class="nhsuk-table__cell">
86+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">ODS code</span>VN0J3
87+
</td>
88+
<td role="cell" class="nhsuk-table__cell">
89+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Type</span>NHS Trust
90+
</td>
91+
<td role="cell" class="nhsuk-table__cell">
92+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Status</span>Active
93+
</td>
94+
</tr>
95+
<tr role="row" class="nhsuk-table__row">
96+
<td role="cell" class="nhsuk-table__cell">
97+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Organisation </span><a href="/regions/v1/organisations/{{ organisation.id }}">Oxford Road Pharmacy</a>
98+
</td>
99+
<td role="cell" class="nhsuk-table__cell">
100+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">ODS code</span>PP34
101+
</td>
102+
<td role="cell" class="nhsuk-table__cell">
103+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Type</span>Community Pharmacy
104+
</td>
105+
<td role="cell" class="nhsuk-table__cell">
106+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Status</span>Active
107+
</td>
108+
109+
</tbody>
110+
</table>
111+
112+
</div>
113+
</div>
114+
115+
{% if closedOrganisationsCount > 0 %}
116+
<p><a href="/regions/v1/organisations/closed">View {{ closedOrganisationsCount | plural("closed organisation") }}</a></p>
117+
{% endif %}
118+
119+
{% endblock %}

‎app/views/regions/v1/onboarding0.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ <h1 class="nhsuk-heading-xl">Apply to use the Record a vaccination service</h1>
1919

2020
<p>Your NHS region will review your application. We'll let you know within 7 working days if it has been approved.</p>
2121

22-
22+
<br>
2323
<div class="nhsuk-form-group">
2424
<h2 class="nhsuk-label-wrapper">
2525
<label class="nhsuk-label nhsuk-label--m nhsuk-u-margin-bottom-1" for="organisationCode">
26-
NHS organisation or community pharmacy
26+
Find your pharmacy
2727
</label>
2828
</h2>
2929
<div class="nhsuk-hint" id="organisationName-hint">

0 commit comments

Comments
 (0)