Skip to content

Commit 0c64124

Browse files
devansXDdevansXD
authored
Merge pull request #50 from devansXD/dave-branch5
product and search
2 parents 10db4a2 + ec77570 commit 0c64124

File tree

6 files changed

+190
-184
lines changed

6 files changed

+190
-184
lines changed

‎app/assets/images/smartpump-300.png‎

169 KB
Loading

‎app/assets/images/woundcare.png‎

193 KB
Loading

‎app/views/current/product-page-wound-care.html‎

Lines changed: 5 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ <h1 class="nhsuk-heading-xl nhsuk-u-margin-bottom-2">
4242
Advanced Woundcare Therapeutics Ltd
4343
</p>
4444

45-
<div class="nhsuk-u-margin-bottom-5">
46-
47-
<strong class="nhsuk-tag nhsuk-tag--white">SME</strong>
48-
<strong class="nhsuk-tag nhsuk-tag--green">NHS Supply Chain approved</strong>
49-
</div>
45+
<div class="nhsuk-card nhsuk-u-margin-bottom-6">
46+
<img src="/images/woundcare.png"
47+
alt="Wound Care System"
48+
class="product-image" />
49+
</div>
5050

5151
{% from "contents-list/macro.njk" import contentsList %}
5252

@@ -201,29 +201,6 @@ <h2 class="nhsuk-card__heading nhsuk-heading-s">
201201

202202

203203

204-
205-
<div class="nhsuk-u-margin-top-4">
206-
207-
<h3 class="nhsuk-card__heading nhsuk-heading-s">
208-
Related resources
209-
</h3>
210-
211-
<ul class="nhsuk-list">
212-
<li>
213-
<a href="#">Product brochure (PDF)</a>
214-
</li>
215-
216-
217-
218-
<li>
219-
<a href="#">Safety data sheet</a>
220-
</li>
221-
<li>
222-
<a href="#">Training materials</a>
223-
</li>
224-
</ul>
225-
226-
</div>
227204

228205

229206

‎app/views/current/product-page.html‎

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ <h1 class="nhsuk-heading-xl nhsuk-u-margin-bottom-3">
3838
MedTech Innovations Ltd
3939
</p>
4040

41-
<div class="nhsuk-u-margin-bottom-5">
42-
<strong class="nhsuk-tag nhsuk-tag--white">UK manufactured</strong>
43-
<strong class="nhsuk-tag nhsuk-tag--white">SME</strong>
44-
<strong class="nhsuk-tag nhsuk-tag--white">Clinical trial available</strong>
45-
</div>
41+
<div class="nhsuk-card nhsuk-u-margin-bottom-6">
42+
<img src="/images/smartpump-300.png"
43+
alt="SmartPump 300 Infusion System"
44+
class="product-image" />
45+
</div>
4646

4747

4848
{% from "contents-list/macro.njk" import contentsList %}
@@ -468,26 +468,7 @@ <h3 class="nhsuk-heading-s nhsuk-u-margin-top-4">Clinical trial data</h3>
468468

469469

470470
{# Quick Links #}
471-
<div class="nhsuk-u-margin-top-4">
472-
473-
<h3 class="nhsuk-card__heading nhsuk-heading-s">
474-
Related resources
475-
</h3>
476-
477-
<ul class="nhsuk-list">
478-
<li>
479-
<a href="#">Product brochure (PDF)</a>
480-
</li>
481-
482-
<li>
483-
<a href="#">Safety data sheet</a>
484-
</li>
485-
<li>
486-
<a href="#">Training materials</a>
487-
</li>
488-
</ul>
489-
490-
</div>
471+
491472

492473

493474

‎app/views/current/search-results.html‎

Lines changed: 45 additions & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ <h1 class="nhsuk-heading-l">Search results</h1>
5353

5454
<div class="nhsuk-grid-row">
5555

56-
{# Filters Sidebar #}
56+
{# Filters Sidebar #}
5757
<app-auto-submit class="app-grid-column-filters">
5858

5959
<div class="nhsuk-card nhsuk-card--feature app-filters">
@@ -62,169 +62,100 @@ <h3 class="nhsuk-card__heading nhsuk-card__heading--feature">
6262
Filter results
6363
</h3>
6464

65-
{# Product Category Filter #}
65+
66+
67+
68+
{# Clinical Trial Status Filter #}
6669
<div class="nhsuk-form-group">
6770
<fieldset class="nhsuk-fieldset">
6871
<legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--s">
69-
Product category
72+
Procured in other trusts
7073
</legend>
7174

72-
<div id="category-items" class="nhsuk-checkboxes nhsuk-checkboxes--small" data-module="nhsuk-checkboxes" data-nhsuk-checkboxes-init="">
73-
<div class="nhsuk-checkboxes__item">
74-
<input class="nhsuk-checkboxes__input" id="category-infusion" name="[category]" type="checkbox" value="infusion" checked="">
75-
<label class="nhsuk-label nhsuk-checkboxes__label" for="category-infusion">
76-
Infusion devices
77-
</label>
78-
</div>
79-
80-
<div class="nhsuk-checkboxes__item">
81-
<input class="nhsuk-checkboxes__input" id="category-surgical" name="[category]" type="checkbox" value="surgical">
82-
<label class="nhsuk-label nhsuk-checkboxes__label" for="category-surgical">
83-
Surgical instruments
84-
</label>
85-
</div>
86-
87-
<div class="nhsuk-checkboxes__item">
88-
<input class="nhsuk-checkboxes__input" id="category-monitoring" name="[category]" type="checkbox" value="monitoring">
89-
<label class="nhsuk-label nhsuk-checkboxes__label" for="category-monitoring">
90-
Patient monitoring
91-
</label>
92-
</div>
93-
94-
<div class="nhsuk-checkboxes__item">
95-
<input class="nhsuk-checkboxes__input" id="category-diagnostic" name="[category]" type="checkbox" value="diagnostic">
96-
<label class="nhsuk-label nhsuk-checkboxes__label" for="category-diagnostic">
97-
Diagnostic equipment
98-
</label>
99-
</div>
100-
101-
<div class="nhsuk-checkboxes__item">
102-
<input class="nhsuk-checkboxes__input" id="category-cardiology" name="[category]" type="checkbox" value="cardiology">
103-
<label class="nhsuk-label nhsuk-checkboxes__label" for="category-cardiology">
104-
Cardiology devices
105-
</label>
106-
</div>
107-
108-
<div class="nhsuk-checkboxes__item">
109-
<input class="nhsuk-checkboxes__input" id="category-respiratory" name="[category]" type="checkbox" value="respiratory">
110-
<label class="nhsuk-label nhsuk-checkboxes__label" for="category-respiratory">
111-
Respiratory equipment
75+
<div id="trial-items" class="nhsuk-radios nhsuk-radios--small" data-module="nhsuk-radios" data-nhsuk-radios-init="">
76+
<div class="nhsuk-radios__item">
77+
<input class="nhsuk-radios__input" id="trial-any" name="[trial]" type="radio" value="any" checked="">
78+
<label class="nhsuk-label nhsuk-radios__label" for="trial-any">
79+
Any
11280
</label>
11381
</div>
11482

115-
<div class="nhsuk-checkboxes__item">
116-
<input class="nhsuk-checkboxes__input" id="category-imaging" name="[category]" type="checkbox" value="imaging">
117-
<label class="nhsuk-label nhsuk-checkboxes__label" for="category-imaging">
118-
Imaging systems
119-
</label>
120-
</div>
12183

122-
<div class="nhsuk-checkboxes__item">
123-
<input class="nhsuk-checkboxes__input" id="category-laboratory" name="[category]" type="checkbox" value="laboratory">
124-
<label class="nhsuk-label nhsuk-checkboxes__label" for="category-laboratory">
125-
Laboratory equipment
126-
</label>
127-
</div>
84+
12885
</div>
12986
</fieldset>
13087
</div>
13188

132-
{# NEW: Trust Similarity Filter #}
89+
{# Supplier Size Filter #}
13390
<div class="nhsuk-form-group">
13491
<fieldset class="nhsuk-fieldset">
13592
<legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--s">
136-
Evaluated by trusts like mine
93+
Supplier size
13794
</legend>
138-
<div class="nhsuk-hint" id="trust-hint">
139-
Show products evaluated by trusts similar in size, type, or region
140-
</div>
14195

142-
<div id="trust-items" class="nhsuk-checkboxes nhsuk-checkboxes--small" data-module="nhsuk-checkboxes" data-nhsuk-checkboxes-init="">
96+
<div id="supplier-items" class="nhsuk-checkboxes nhsuk-checkboxes--small" data-module="nhsuk-checkboxes" data-nhsuk-checkboxes-init="">
14397
<div class="nhsuk-checkboxes__item">
144-
<input class="nhsuk-checkboxes__input" id="trust-similar" name="[trust]" type="checkbox" value="similar">
145-
<label class="nhsuk-label nhsuk-checkboxes__label" for="trust-similar">
146-
Similar size to my trust
98+
<input class="nhsuk-checkboxes__input" id="supplier-sme" name="[supplier]" type="checkbox" value="sme">
99+
<label class="nhsuk-label nhsuk-checkboxes__label" for="supplier-sme">
100+
1-50 employees
147101
</label>
148102
</div>
149103

104+
105+
</div>
106+
<div id="supplier-items" class="nhsuk-checkboxes nhsuk-checkboxes--small" data-module="nhsuk-checkboxes" data-nhsuk-checkboxes-init="">
150107
<div class="nhsuk-checkboxes__item">
151-
<input class="nhsuk-checkboxes__input" id="trust-teaching" name="[trust]" type="checkbox" value="teaching">
152-
<label class="nhsuk-label nhsuk-checkboxes__label" for="trust-teaching">
153-
Teaching hospitals
108+
<input class="nhsuk-checkboxes__input" id="supplier-sme" name="[supplier]" type="checkbox" value="sme">
109+
<label class="nhsuk-label nhsuk-checkboxes__label" for="supplier-sme">
110+
51-250 employees
154111
</label>
155112
</div>
156113

157-
<div class="nhsuk-checkboxes__item">
158-
<input class="nhsuk-checkboxes__input" id="trust-region" name="[trust]" type="checkbox" value="region">
159-
<label class="nhsuk-label nhsuk-checkboxes__label" for="trust-region">
160-
In my region
161-
</label>
162-
</div>
163-
164-
<div class="nhsuk-checkboxes__item">
165-
<input class="nhsuk-checkboxes__input" id="trust-specialist" name="[trust]" type="checkbox" value="specialist">
166-
<label class="nhsuk-label nhsuk-checkboxes__label" for="trust-specialist">
167-
Specialist trusts
168-
</label>
169-
</div>
114+
170115
</div>
116+
171117
</fieldset>
172118
</div>
173119

174-
{# Clinical Trial Status Filter #}
120+
{# Supplier Maturity Filter #}
175121
<div class="nhsuk-form-group">
176122
<fieldset class="nhsuk-fieldset">
177123
<legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--s">
178-
Clinical trial status
124+
Supplier maturity
179125
</legend>
180126

181-
<div id="trial-items" class="nhsuk-radios nhsuk-radios--small" data-module="nhsuk-radios" data-nhsuk-radios-init="">
182-
<div class="nhsuk-radios__item">
183-
<input class="nhsuk-radios__input" id="trial-any" name="[trial]" type="radio" value="any" checked="">
184-
<label class="nhsuk-label nhsuk-radios__label" for="trial-any">
185-
Any
127+
<div id="supplier-items" class="nhsuk-checkboxes nhsuk-checkboxes--small" data-module="nhsuk-checkboxes" data-nhsuk-checkboxes-init="">
128+
<div class="nhsuk-checkboxes__item">
129+
<input class="nhsuk-checkboxes__input" id="supplier-sme" name="[supplier]" type="checkbox" value="sme">
130+
<label class="nhsuk-label nhsuk-checkboxes__label" for="supplier-sme">
131+
1-2 years old
186132
</label>
187133
</div>
188134

189-
<div class="nhsuk-radios__item">
190-
<input class="nhsuk-radios__input" id="trial-yes" name="[trial]" type="radio" value="yes">
191-
<label class="nhsuk-label nhsuk-radios__label" for="trial-yes">
192-
Clinical trial available
135+
136+
</div>
137+
<div id="supplier-items" class="nhsuk-checkboxes nhsuk-checkboxes--small" data-module="nhsuk-checkboxes" data-nhsuk-checkboxes-init="">
138+
<div class="nhsuk-checkboxes__item">
139+
<input class="nhsuk-checkboxes__input" id="supplier-sme" name="[supplier]" type="checkbox" value="sme">
140+
<label class="nhsuk-label nhsuk-checkboxes__label" for="supplier-sme">
141+
3-5 years old
193142
</label>
194143
</div>
195144

196-
<div class="nhsuk-radios__item">
197-
<input class="nhsuk-radios__input" id="trial-no" name="[trial]" type="radio" value="no">
198-
<label class="nhsuk-label nhsuk-radios__label" for="trial-no">
199-
No clinical trial
200-
</label>
201-
</div>
145+
202146
</div>
203-
</fieldset>
204-
</div>
205147

206-
{# Supplier Type Filter #}
207-
<div class="nhsuk-form-group">
208-
<fieldset class="nhsuk-fieldset">
209-
<legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--s">
210-
Supplier type
211-
</legend>
212-
213-
<div id="supplier-items" class="nhsuk-checkboxes nhsuk-checkboxes--small" data-module="nhsuk-checkboxes" data-nhsuk-checkboxes-init="">
148+
<div id="supplier-items" class="nhsuk-checkboxes nhsuk-checkboxes--small" data-module="nhsuk-checkboxes" data-nhsuk-checkboxes-init="">
214149
<div class="nhsuk-checkboxes__item">
215150
<input class="nhsuk-checkboxes__input" id="supplier-sme" name="[supplier]" type="checkbox" value="sme">
216151
<label class="nhsuk-label nhsuk-checkboxes__label" for="supplier-sme">
217-
SME
152+
5+ years old
218153
</label>
219154
</div>
220155

221-
<div class="nhsuk-checkboxes__item">
222-
<input class="nhsuk-checkboxes__input" id="supplier-uk" name="[supplier]" type="checkbox" value="uk-made">
223-
<label class="nhsuk-label nhsuk-checkboxes__label" for="supplier-uk">
224-
UK manufactured
225-
</label>
226-
</div>
156+
227157
</div>
158+
228159
</fieldset>
229160
</div>
230161

0 commit comments

Comments
 (0)