Skip to content

Commit ee707e3

Browse files
michaelNetCompanymichaelNetCompany
committed
Creating index page and contents list
1 parent aec79c0 commit ee707e3

File tree

3 files changed

+42
-232
lines changed

3 files changed

+42
-232
lines changed

‎app/views/admin/listings-manage-reg.html‎

Lines changed: 34 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,8 @@
1-
<!-- Use this page as the index for your project -->
2-
3-
<!-- ADDING CUSTOM CSS - Add your custom CSS or Sass in /app/assets/sass/main.scss -->
4-
5-
<!-- Extends the layout from /views/layout.html -->
6-
{% extends 'layout.html' %}
7-
<!--
8-
In /views/layout.html you can:
9-
- change the header and footer
10-
- add custom CSS and JavaScript
11-
-->
1+
{% extends 'reg-portal/layout.html' %}
122

133
<!-- Set the page title -->
144
{% block pageTitle %}
15-
Page listings - GP registration - NHS
5+
Page listings - Manage patient registrations - NHS
166
{% endblock %}
177

188
<!-- For adding a breadcrumb -->
@@ -37,18 +27,44 @@ <h1 class="app-page-heading">
3727
<span class="nhsuk-caption-l">Prototype work</span>
3828
Page by page listings
3929
</h1>
40-
41-
<p class="nhsuk-body-s">Last updated: 19 June 2023</p>
4230
<p><a href="data">Data been stored as part of current session</a></p>
4331

4432

45-
<h2 class="nhsuk-heading-l">Patient details</h2>
33+
<h2 class="nhsuk-heading-l">Login</h2>
34+
35+
<ul class="nhsuk-list nhsuk-list--bullet">
36+
<li><a href="/reg-portal/login">Service start page</a></li>
37+
<li><a href="/reg-portal/login-options">CIS2 login options</a> - We don't own the design of this page</li>
38+
</ul>
39+
40+
<h2 class="nhsuk-heading-l">Dashboard</h2>
41+
42+
<ul class="nhsuk-list nhsuk-list--bullet">
43+
<li><a href="/reg-portal/dashboard">Dashboard</a></li>
44+
</ul>
45+
46+
<h2 class="nhsuk-heading-l">Patient registrations</h2>
47+
48+
<ul class="nhsuk-list nhsuk-list--bullet">
49+
<li><a href="/reg-portal/reg-table-v2-yes-no">Registrations table</a></li>
50+
<li><a href="/reg-portal/reg-table-v2-yes-no-page-2">Registrations table - page 2 example</a></li>
51+
<li><a href="/reg-portal/reg-table-v2-yes-no-sorted">Registrations table - sort by name a-z example</a></li>
52+
<li><a href="/reg-portal/reg-table-v2-yes-no-sorted-reverse">Registrations table - sort by name z-a example</a></li>
53+
</ul>
54+
55+
<h2 class="nhsuk-heading-l">Registration details</h2>
56+
57+
<ul class="nhsuk-list nhsuk-list--bullet">
58+
<li><a href="/reg-portal/reg-detail-multi-detail">Adult registration</a></li>
59+
<li><a href="/reg-portal/reg-detail-multi-detail-child">Child, out of catchment registration</a></li>
60+
</ul>
4661

47-
<h4 class="nhsuk-heading-s">Start</h4>
62+
<h2 class="nhsuk-heading-l">Approve or reject registration</h2>
4863

4964
<ul class="nhsuk-list nhsuk-list--bullet">
50-
<li><a href="/live/start" >Service start page</a></li>
51-
<li><a href="/live/who-is-registering" >Who is registering with a GP?</a></li>
65+
<li><a href="/reg-portal/accept-confirm">Approval confirmed</a></li>
66+
<li><a href="/reg-portal/reject-reasons">Rejection reasons</a></li>
67+
<li><a href="/reg-portal/reject-confirm">Rejection confirmed</a></li>
5268
</ul>
5369

5470
</div>

‎app/views/reg-portal/index.html‎

Lines changed: 7 additions & 213 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,8 @@
1-
<!-- Use this page as the index for your project -->
2-
3-
<!-- ADDING CUSTOM CSS - Add your custom CSS or Sass in /app/assets/sass/main.scss -->
4-
5-
<!-- Extends the layout from /views/layout.html -->
6-
{% extends 'layout.html' %}
7-
<!--
8-
In /views/layout.html you can:
9-
- change the header and footer
10-
- add custom CSS and JavaScript
11-
-->
1+
{% extends 'reg-portal/layout.html' %}
122

133
<!-- Set the page title -->
144
{% block pageTitle %}
15-
GP Registration Prototype
5+
Manage patient registrations Prototype
166
{% endblock %}
177

188
<!-- For adding a breadcrumb -->
@@ -36,47 +26,25 @@ <h1 class="app-page-heading">
3626
Prototype work
3727
<span class="nhsuk-u-visually-hidden"></span>
3828
</span>
39-
Register with a GP Surgery
29+
Manage patient registrations
4030
</h1>
4131

42-
<!--<ul class="nhsuk-list nhsuk-body-s">
43-
<li>Last updated: 01 June 2023</li>
44-
<li>Prototype version: v3.0.4</li>
45-
</ul>-->
46-
47-
<p>Use this service to register with GP surgeries in England.</p>
48-
49-
<p><a href="/live/start?devMode=true">run 'live' in devMode</a></p>
50-
<p><a href="/design/start?devMode=true">run 'design' in devMode</a></p>
51-
52-
<h2 class="nhsuk-heading-l">Latest live flow</h2>
53-
<!--<p>This sprint will be focusing on:</p>
54-
55-
<ul class="nhsuk-list nhsuk-list--bullet">
56-
<li>New question set grouping and NHS login provisioning API</li>
57-
</ul>-->
32+
<h2 class="nhsuk-heading-l">Phase 1 flow</h2>
5833

5934
{{ button({
6035
"text": "Continue",
61-
"href": "/live/start"
36+
"href": "/reg-portal/login"
6237
}) }}
6338

6439
{{ button({
6540
"text": "Page listings",
6641
"classes": "nhsuk-button--secondary",
67-
"href": "admin/listings"
42+
"href": "admin/listings-manage-reg"
6843
}) }}
6944

70-
<!--{{ button({
71-
"text": "Preload options",
72-
"href": "admin/preload"
73-
}) }}-->
74-
7545
<hr class="nhsuk-section-break nhsuk-section-break--l nhsuk-section-break--visible">
7646

77-
78-
<h2 class="nhsuk-heading-l">GP self onboarding portal</h2>
79-
<p>GP admin portal for self onboarding</p>
47+
<!--<h2 class="nhsuk-heading-l">Work in progress</h2>
8048
8149
{{ button({
8250
"text": "Continue",
@@ -89,184 +57,10 @@ <h2 class="nhsuk-heading-l">GP self onboarding portal</h2>
8957
"href": "admin/listings-gp"
9058
}) }}
9159
92-
93-
<br>
94-
95-
{{ button({
96-
"text": "Journey flow for NaP",
97-
"href": "/gp/nap-email"
98-
}) }}
99-
100-
101-
<hr class="nhsuk-section-break nhsuk-section-break--l nhsuk-section-break--visible">
102-
103-
104-
<!--<h2 class="nhsuk-heading-l">NHS App intergration</h2>
105-
<p>NHS App intergration authentication journeys + errors pages</p>
106-
107-
<form action="/sprint-12/section-1/registered-for-the-first-time" method="post" autocomplete="off">
108-
<input type="hidden" name="user-auth" id="user-auth" value="p9" />
109-
{{ button({
110-
"text": "Continue (P9)",
111-
"href": ""
112-
}) }}
113-
114-
</form>
115-
116-
<form action="/sprint-12/section-1/registered-for-the-first-time" method="post" autocomplete="off">
117-
<input type="hidden" name="user-auth" id="user-auth" value="p5" />
118-
{{ button({
119-
"text": "Continue (P5)",
120-
"href": ""
121-
}) }}
122-
123-
{{ button({
124-
"text": "Page listings",
125-
"classes": "nhsuk-button--secondary",
126-
"href": "admin/listings-app"
127-
}) }}
128-
129-
</form>
130-
13160
<hr class="nhsuk-section-break nhsuk-section-break--l nhsuk-section-break--visible">-->
13261

133-
134-
<!--<h2 class="nhsuk-heading-l">User research</h2>
135-
<p>Area of the prototype for user research purposes, including link to share with user testing participants.</p>
136-
137-
{{ button({
138-
"text": "Continue",
139-
"href": "admin/user-research"
140-
}) }}
141-
142-
<hr class="nhsuk-section-break nhsuk-section-break--l nhsuk-section-break--visible">
143-
144-
145-
<h2 class="nhsuk-heading-l">Development baseline</h2>
146-
<p>Version of the prototype for use by the development team. Does not contain any content or design work not yet approved for build or gone through user research.</p>
147-
148-
{{ button({
149-
"text": "Continue",
150-
"href": "https://register.dev.gp-registration.nhs.uk/1234/gpregistration/landing"
151-
}) }}
152-
153-
<hr class="nhsuk-section-break nhsuk-section-break--l nhsuk-section-break--visible">-->
154-
155-
156-
<!--<h2 class="nhsuk-heading-l">Previous iterations</h2>
157-
<p>Previous sprint work and iterations of the service at a given point in time (Still working on implementation).</p>
158-
159-
<table class="nhsuk-table">
160-
161-
<thead role="rowgroup" class="nhsuk-table__head">
162-
<tr role="row">
163-
<th role="columnheader" class="" scope="col" width="25%">
164-
Iteration
165-
</th>
166-
<th role="columnheader" class="" scope="col">
167-
Description
168-
</th>
169-
</tr>
170-
</thead>
171-
<tbody class="nhsuk-table__body">
172-
<tr role="row" class="nhsuk-table__row">
173-
<td class="nhsuk-table__cell"><a href="/sprint-12/landing">Sprint 13</td>
174-
<td class="nhsuk-table__cell ">New question set order / Height and weight / SCR</td>
175-
</tr>
176-
<tr role="row" class="nhsuk-table__row">
177-
<td class="nhsuk-table__cell"><a href="/sprint-12/landing">Sprint 12</td>
178-
<td class="nhsuk-table__cell ">Contact prefrences / NHS App interegration</td>
179-
</tr>
180-
<tr role="row" class="nhsuk-table__row">
181-
<td class="nhsuk-table__cell"><a href="/sprint-11/landing">Sprint 11</td>
182-
<td class="nhsuk-table__cell ">Mandatory questions added / Dispencing doctors</td>
183-
</tr>
184-
<tr role="row" class="nhsuk-table__row">
185-
<td class="nhsuk-table__cell"><a href="/sprint-10/landing">Sprint 10</td>
186-
<td class="nhsuk-table__cell ">GP self onboarding / Out of area / Dispencing doctors</td>
187-
</tr>
188-
<tr role="row" class="nhsuk-table__row">
189-
<td class="nhsuk-table__cell"><a href="/sprint-9/landing">Sprint 9</td>
190-
<td class="nhsuk-table__cell ">GP self onboarding and GP email</td>
191-
</tr>
192-
<tr role="row" class="nhsuk-table__row">
193-
<td class="nhsuk-table__cell"><a href="/sprint-8/landing">Sprint 8</td>
194-
<td class="nhsuk-table__cell ">Updates from beta service for Nominated pharmacy</td>
195-
</tr>
196-
<tr role="row" class="nhsuk-table__row">
197-
<td class="nhsuk-table__cell"><a href="/sprint-7/landing">Sprint 7</td>
198-
<td class="nhsuk-table__cell ">Dependant and carer journeys</td>
199-
</tr>
200-
<tr role="row" class="nhsuk-table__row">
201-
<td class="nhsuk-table__cell"><a href="/sprint-6/landing">Sprint 6</td>
202-
<td class="nhsuk-table__cell ">PDS matching upfront testing with type 4 (immigration) and Dependant journeys and ex UK armed forces</td>
203-
</tr>
204-
<tr role="row" class="nhsuk-table__row">
205-
<td class="nhsuk-table__cell"><a href="/sprint-5/landing">Sprint 5</td>
206-
<td class="nhsuk-table__cell ">PDS matching upfront testing with type 4 (immigration) and Dependant journeys and ex UK armed forces</td>
207-
</tr>
208-
<tr role="row" class="nhsuk-table__row">
209-
<td class="nhsuk-table__cell"><a href="/sprint-4/landing">Sprint 4</td>
210-
<td class="nhsuk-table__cell ">PDS matching upfront to ask supplementry questions for user types</td>
211-
</tr>
212-
<tr role="row" class="nhsuk-table__row">
213-
<td class="nhsuk-table__cell"><a href="/sprint-3/landing">Sprint 3</td>
214-
<td class="nhsuk-table__cell ">Testing with Type 4 (immigration) and no fixed abode user groups</td>
215-
</tr>
216-
<tr role="row" class="nhsuk-table__row">
217-
<td class="nhsuk-table__cell"><a href="/sprint-2/landing">Sprint 2</td>
218-
<td class="nhsuk-table__cell ">Testing with GP admins to understand if the flows + outputs meet their needs</td>
219-
</tr>
220-
<tr role="row" class="nhsuk-table__row">
221-
<td class="nhsuk-table__cell"><a href="/sprint-1/landing">Sprint 1</td>
222-
<td class="nhsuk-table__cell ">Looking at NHS login intergration from authentication levels p9/p5/unauth + Using NHS number </td>
223-
</tr>
224-
<tr role="row" class="nhsuk-table__row">
225-
<td class="nhsuk-table__cell"><a href="/v1/1/landing">Discovery</td>
226-
<td class="nhsuk-table__cell ">Team spent time on working out initial user journey and interactions for users 'Changing GP surgery' </td>
227-
</tr>
228-
</tbody>
229-
</table>-->
230-
231-
</div>
232-
</div>
233-
234-
235-
<!-- <section class="nhsuk-section">
236-
<div class="nhsuk-width-container">
237-
<div class="nhsuk-grid-row">
238-
<div class="nhsuk-grid-column-two-thirds">
239-
<h2>
240-
Latest prototypes test
241-
</h2>
242-
<h3 class="nhsuk-heading-xs">Version 1 - July 2020</h3>
243-
<p>
244-
<a class="nhsuk-link nhsuk-link--no-visited-state" href="v1/1/01/index">Updated user flow</a>
245-
</p>
24662
</div>
24763
</div>
248-
</div>
249-
</section>
250-
251-
252-
<section class="nhsuk-section">
253-
<div class="nhsuk-width-container">
254-
<div class="nhsuk-grid-row">
255-
<div class="nhsuk-grid-column-two-thirds">
256-
<h2>
257-
Older prototypes
258-
</h2>
259-
<h3 class="nhsuk-heading-xs">Version 0 - June 2020</h3>
260-
<p>
261-
<a class="nhsuk-link nhsuk-link--no-visited-state" href="v1/0/00/index">Discovery prototype</a>
262-
</p>
263-
</div>
264-
</div>
265-
</div>
266-
</section>
267-
-->
268-
269-
<!-- End of content -->
27064

27165
{% endblock %}
27266

‎app/views/reg-portal/reg-detail-multi-detail-child.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ <h1 class="nhsuk-heading-l">Jane Jones</h1>
2323
<p class="nhsuk-u-margin-bottom-0">Sex</p>
2424
<p class="nhsuk-heading-s nhsuk-u-padding-top-0">Female</p>
2525
<p class="nhsuk-u-margin-bottom-0">Postcode</p>
26-
<p class="nhsuk-heading-s nhsuk-u-padding-top-0">RG6 7JU</p>
26+
<p class="nhsuk-heading-s nhsuk-u-padding-top-0">RG6 7JU - Out of catchment</p>
2727
<div style="display: flex; height: 100%; margin-bottom: 48px;">
2828
<a class="nhsuk-button" style="margin-top:auto; margin-bottom:auto; margin-left:0; margin-right:24px;" href="accept-confirm">Approve</a>
2929
<a href="reject-reasons" style="margin-top:auto; margin-bottom:auto; margin-left:0; margin-right:0;">Reject</a>

0 commit comments

Comments
 (0)