Skip to content

Commit e46cbbc

Browse files
authored
Merge pull request #57 from devansXD/daves-branch6
Daves branch6
2 parents 09838ec + 2f0fe42 commit e46cbbc

10 files changed

+2659
-729
lines changed

.azad/.locked-paths

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
"/Users/davidevans/Documents/Projects/procurement-prototype/app/views/current/search-results.html",
33
"/Users/davidevans/Documents/Projects/procurement-prototype/app/views/current/create-account/email-verification.html",
44
"/Users/davidevans/Documents/Projects/procurement-prototype/app/views/current/create-account/email-welcome.html",
5-
"/Users/davidevans/Documents/Projects/procurement-prototype/app/views/current/search-results-dashboard.html"
5+
"/Users/davidevans/Documents/Projects/procurement-prototype/app/views/current/search-results-dashboard.html",
6+
"/Users/davidevans/Documents/Projects/procurement-prototype/app/views/current/evaluation-shared copy.html"
67
]
Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
{% extends prototypeVersion + '/layouts/layout-signed-in.html' %}
2+
3+
{% set pageName = "Business case shared" %}
4+
{% set serviceHeader = "Medical product evaluations" %}
5+
6+
{% block content %}
7+
<div class="nhsuk-grid-row">
8+
<div class="nhsuk-grid-column-two-thirds">
9+
10+
<div class="nhsuk-panel nhsuk-panel--confirmation nhsuk-u-margin-top-7 nhsuk-u-margin-bottom-7">
11+
<h1 class="nhsuk-panel__title">
12+
Business case shared successfully
13+
</h1>
14+
<div class="nhsuk-panel__body">
15+
Your business case for<br>
16+
<strong>
17+
{% if data['bc-product'] == 'smartpump-infusion-device-pro' %}SmartPump Infusion Device Pro
18+
{% elif data['bc-product'] == 'medflow-infusion-system' %}MedFlow Infusion System 3000
19+
{% elif data['bc-product'] == 'vitalguard-patient-monitor' %}VitalGuard Patient Monitor X1
20+
{% elif data['bc-product'] == 'scanmaster-ultrasound' %}ScanMaster Portable Ultrasound
21+
{% elif data['bc-product'] == 'other' %}{{ data['bc-product-other'] }}
22+
{% else %}your product{% endif %}
23+
</strong><br>
24+
is now visible to NHS procurement professionals
25+
</div>
26+
</div>
27+
28+
<div class="nhsuk-card nhsuk-card--care nhsuk-u-margin-top-4">
29+
<div class="nhsuk-card__content">
30+
<h3 class="nhsuk-card__heading">Your impact</h3>
31+
<p class="nhsuk-body-s">You've now shared <strong>1 business case</strong> that can help other NHS trusts build their own procurement proposals.</p>
32+
<p class="nhsuk-body-s">Business cases are among the most requested documents on Compass — other trusts often spend weeks creating them from scratch.</p>
33+
</div>
34+
</div>
35+
36+
<h2 class="nhsuk-heading-m nhsuk-u-margin-top-6">What happens next?</h2>
37+
38+
<ul class="nhsuk-list nhsuk-list--bullet">
39+
<li>Other trusts and the product supplier will soon be able to view your business case</li>
40+
<li>You can update or remove your business case at any time from your dashboard</li>
41+
<li>Contacts you listed may be approached by other trusts with questions about your submission</li>
42+
</ul>
43+
44+
<a class="nhsuk-action-link" href="#">
45+
<svg class="nhsuk-icon nhsuk-icon--arrow-right-circle" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16" height="16" focusable="false" aria-hidden="true">
46+
<path d="M12 2a10 10 0 0 0-10 9h11.7l-4-4a1 1 0 0 1 1.5-1.4l5.6 5.7a1 1 0 0 1 0 1.4l-5.6 5.7a1 1 0 0 1-1.5 0 1 1 0 0 1 0-1.4l4-4H2A10 10 0 1 0 12 2z"></path>
47+
</svg>
48+
<span class="nhsuk-action-link__text">View your business case as others see it</span>
49+
</a>
50+
51+
<div class="nhsuk-form-group">
52+
<button class="nhsuk-button" data-module="nhsuk-button" type="submit" onclick="window.location.href='share-evaluation-choice'">
53+
Share something else
54+
</button>
55+
<p>
56+
<a href="/" class="nhsuk-link">Return to dashboard</a>
57+
</p>
58+
</div>
59+
60+
<hr class="nhsuk-section-break nhsuk-section-break--l nhsuk-section-break--visible">
61+
62+
<h2 class="nhsuk-heading-m">Do you also have an evaluation to share?</h2>
63+
64+
<p>A business case is most useful to other trusts when it's paired with a product evaluation. If your trust has assessed this product clinically, sharing that evaluation gives others the full picture.</p>
65+
66+
<p>
67+
<a href="upload-evaluation" class="nhsuk-button nhsuk-button--secondary">
68+
Share a product evaluation
69+
</a>
70+
</p>
71+
72+
<hr class="nhsuk-section-break nhsuk-section-break--l nhsuk-section-break--visible">
73+
74+
</div>
75+
</div>
76+
77+
<div class="nhsuk-grid-row">
78+
<div class="nhsuk-grid-column-two-thirds">
79+
80+
<div id="contact">
81+
<div class="nhsuk-card nhsuk-card--care nhsuk-card--care--non-urgent">
82+
<div class="nhsuk-card--care__heading-container">
83+
<h2 class="nhsuk-card--care__heading">
84+
Need help?
85+
</h2>
86+
<span class="nhsuk-card--care__arrow" aria-hidden="true"></span>
87+
</div>
88+
<div class="nhsuk-card__content">
89+
<p>If you have questions about managing your submissions:</p>
90+
<p>Contact the team on 0330 2234 776 or email: <a href="mailto:enquiries@dhsc.gov.uk">enquiries@dhsc.gov.uk</a></p>
91+
</div>
92+
</div>
93+
</div>
94+
95+
</div>
96+
</div>
97+
98+
{% endblock %}

app/views/current/dashboard.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ <h3 class="nhsuk-card__heading"><a href="search">Search and compare medical tech
5959

6060
<div class="nhsuk-card nhsuk-card--clickable">
6161
<div class="nhsuk-card__content">
62-
<h3 class="nhsuk-card__heading"><a href="search">Share your experience with medical technologies</a></h3>
62+
<h3 class="nhsuk-card__heading"><a href="evaluation-choice">Share your experience with medical technologies</a></h3>
6363
<p>Upload your own product trials, case studies, evaluation criteria or business cases.</p>
6464
</div>
6565
</div>
Lines changed: 30 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
1-
{% extends 'layout.html' %}
1+
{% extends prototypeVersion + '/layouts/layout-signed-in.html' %}
22

3-
{% set pageName = "Compass - Quick share evaluation" %}
4-
{% set serviceHeader = "Compass" %}
3+
{% set pageName = "Share with the network" %}
4+
{% set serviceHeader = "Search medical product evaluations" %}
55

66
{% block beforeContent %}
77
{{ breadcrumb({
88
items: [
99
{
10-
text: "Home",
10+
text: "Back to dashboard",
1111
href: "/"
12-
},
13-
{
14-
text: "Share evaluation",
15-
href: "/share-evaluation"
1612
}
1713
],
1814
attributes: {
@@ -25,49 +21,42 @@
2521
<div class="nhsuk-grid-row">
2622
<div class="nhsuk-grid-column-full">
2723

28-
<h1 class="nhsuk-heading-xl">Share your evaluation</h1>
29-
30-
<p class="nhsuk-body-l">Choose how you'd like to share your evaluation:</p>
24+
<h1 class="nhsuk-heading-l">What do you want to share today?</h1>
25+
<p>Both types of document help other trusts make better procurement decisions. Share one or both.</p>
26+
</div>
27+
</div>
3128

32-
<div class="nhsuk-grid-row nhsuk-u-margin-top-6">
29+
<div class="nhsuk-grid-row">
30+
31+
<div class="nhsuk-grid-column-one-half">
32+
33+
<div class="nhsuk-card nhsuk-card--clickable nhsuk-u-margin-bottom-4">
34+
<div class="nhsuk-card__content">
35+
<h2 class="nhsuk-card__heading nhsuk-heading-m">
36+
<a class="nhsuk-card__link" href="quick-share-upload-multiple">Product evaluation</a>
37+
</h2>
38+
<p class="nhsuk-card__description">A report or document from when your trust trialled, assessed or reviewed a medical product.</p>
3339

34-
<!-- Option 1: Quick Share -->
35-
<div class="nhsuk-grid-column-one-half">
36-
<div class="nhsuk-card nhsuk-card--clickable">
37-
<div class="nhsuk-card__content">
38-
<h2 class="nhsuk-card__heading nhsuk-heading-m">
39-
<a class="nhsuk-card__link" href="/quick-share-upload">Quick share</a>
40-
</h2>
41-
<p class="nhsuk-card__description">
42-
<strong>Upload existing evaluation documents</strong>
43-
</p>
44-
45-
46-
</div>
47-
</div>
4840
</div>
41+
</div>
4942

50-
<!-- Option 2: Full Evaluation -->
51-
<div class="nhsuk-grid-column-one-half">
52-
<div class="nhsuk-card nhsuk-card--clickable">
53-
<div class="nhsuk-card__content">
54-
<h2 class="nhsuk-card__heading nhsuk-heading-m">
55-
<a class="nhsuk-card__link" href="/evaluation-details">Full evaluation form</a>
56-
</h2>
57-
<p class="nhsuk-card__description">
58-
<strong>Create a structured evaluation</strong>
59-
</p>
43+
</div>
6044

45+
<div class="nhsuk-grid-column-one-half">
6146

62-
63-
</div>
64-
</div>
47+
<div class="nhsuk-card nhsuk-card--clickable nhsuk-u-margin-bottom-6">
48+
<div class="nhsuk-card__content">
49+
<h2 class="nhsuk-card__heading nhsuk-heading-m">
50+
<a class="nhsuk-card__link" href="upload-business-case">Business case</a>
51+
</h2>
52+
<p class="nhsuk-card__description">A document making the strategic, clinical or financial case for procuring a product.</p>
6553
</div>
66-
6754
</div>
6855

69-
56+
7057

7158
</div>
59+
7260
</div>
61+
7362
{% endblock %}

app/views/current/evaluation-shared.html

Lines changed: 55 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,21 @@ <h1 class="nhsuk-panel__title">
2020
</div>
2121
</div>
2222

23+
24+
25+
26+
27+
<div class="nhsuk-card nhsuk-card--care nhsuk-u-margin-top-4">
28+
<div class="nhsuk-card__content">
29+
<h3 class="nhsuk-card__heading">
30+
Your impact
31+
</h3>
32+
<p class="nhsuk-body-s">You've now shared <strong>2 evaluations</strong> that are helping NHS trusts make better procurement decisions.</p>
33+
<p class="nhsuk-body-s">Your evaluations have been viewed <strong>47 times</strong> by other trusts.</p>
34+
</div>
35+
</div>
36+
37+
2338
<h2 class="nhsuk-heading-m">What happens next?</h2>
2439

2540
<ul class="nhsuk-list nhsuk-list--bullet">
@@ -110,31 +125,49 @@ <h3 class="nhsuk-card__heading">
110125
</a>
111126
</p>
112127

128+
129+
113130
</div>
114131

115-
<div class="nhsuk-grid-column-one-third">
116-
<div class="nhsuk-card nhsuk-u-margin-top-7">
117-
<div class="nhsuk-card__content">
118-
<h3 class="nhsuk-card__heading">
119-
Need help?
120-
</h3>
121-
<p class="nhsuk-body-s">If you have questions about managing your evaluations:</p>
122-
<ul class="nhsuk-list nhsuk-body-s">
123-
<li><a href="/help/manage-evaluations">Managing evaluations guide</a></li>
124-
<li><a href="/help/contact">Contact support</a></li>
125-
</ul>
126-
</div>
127-
</div>
132+
128133

129-
<div class="nhsuk-card nhsuk-card--care nhsuk-u-margin-top-4">
130-
<div class="nhsuk-card__content">
131-
<h3 class="nhsuk-card__heading">
132-
Your impact
133-
</h3>
134-
<p class="nhsuk-body-s">You've now shared <strong>2 evaluations</strong> that are helping NHS trusts make better procurement decisions.</p>
135-
<p class="nhsuk-body-s">Your evaluations have been viewed <strong>47 times</strong> by other trusts.</p>
136-
</div>
137-
</div>
134+
135+
</div>
136+
137+
<div class="nhsuk-grid-row">
138+
<div class="nhsuk-grid-column-two-thirds">
139+
140+
141+
142+
143+
<div id="contact">
144+
145+
146+
147+
148+
149+
<div class="nhsuk-card nhsuk-card--care nhsuk-card--care--non-urgent">
150+
<div class="nhsuk-card--care__heading-container">
151+
<h2 class="nhsuk-card--care__heading">
152+
Need help?
153+
</h2>
154+
<span class="nhsuk-card--care__arrow" aria-hidden="true"></span>
138155
</div>
156+
157+
<div class="nhsuk-card__content">
158+
159+
<p>If you have questions about managing your evaluations:</p>
160+
161+
162+
</ul>
163+
<p>In all instances, contact the team on 0330 2234 776 or email: <a href="">enquiries@dhsc.gov.uk</a></p>
164+
165+
166+
</div>
167+
</div>
168+
139169
</div>
170+
</div>
171+
</div>
172+
140173
{% endblock %}

0 commit comments

Comments
 (0)