Skip to content

product and search #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
devansXD merged 2 commits into from
Mar 4, 2026
Merged

product and search #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
413af3e
product and search
devansXD Mar 4, 2026
ec77570
Merge branch 'master' into dave-branch5
devansXD Mar 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added app/assets/images/smartpump-300.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/woundcare.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
33 changes: 5 additions & 28 deletions app/views/current/product-page-wound-care.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@ <h1 class="nhsuk-heading-xl nhsuk-u-margin-bottom-2">
Advanced Woundcare Therapeutics Ltd
</p>

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

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

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




<div class="nhsuk-u-margin-top-4">

<h3 class="nhsuk-card__heading nhsuk-heading-s">
Related resources
</h3>

<ul class="nhsuk-list">
<li>
<a href="#">Product brochure (PDF)</a>
</li>



<li>
<a href="#">Safety data sheet</a>
</li>
<li>
<a href="#">Training materials</a>
</li>
</ul>

</div>



Expand Down
31 changes: 6 additions & 25 deletions app/views/current/product-page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ <h1 class="nhsuk-heading-xl nhsuk-u-margin-bottom-3">
MedTech Innovations Ltd
</p>

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


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


{# Quick Links #}
<div class="nhsuk-u-margin-top-4">

<h3 class="nhsuk-card__heading nhsuk-heading-s">
Related resources
</h3>

<ul class="nhsuk-list">
<li>
<a href="#">Product brochure (PDF)</a>
</li>

<li>
<a href="#">Safety data sheet</a>
</li>
<li>
<a href="#">Training materials</a>
</li>
</ul>

</div>




Expand Down
159 changes: 45 additions & 114 deletions app/views/current/search-results.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ <h1 class="nhsuk-heading-l">Search results</h1>

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

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

<div class="nhsuk-card nhsuk-card--feature app-filters">
Expand All @@ -62,169 +62,100 @@ <h3 class="nhsuk-card__heading nhsuk-card__heading--feature">
Filter results
</h3>

{# Product Category Filter #}



{# Clinical Trial Status Filter #}
<div class="nhsuk-form-group">
<fieldset class="nhsuk-fieldset">
<legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--s">
Product category
Procured in other trusts
</legend>

<div id="category-items" class="nhsuk-checkboxes nhsuk-checkboxes--small" data-module="nhsuk-checkboxes" data-nhsuk-checkboxes-init="">
<div class="nhsuk-checkboxes__item">
<input class="nhsuk-checkboxes__input" id="category-infusion" name="[category]" type="checkbox" value="infusion" checked="">
<label class="nhsuk-label nhsuk-checkboxes__label" for="category-infusion">
Infusion devices
</label>
</div>

<div class="nhsuk-checkboxes__item">
<input class="nhsuk-checkboxes__input" id="category-surgical" name="[category]" type="checkbox" value="surgical">
<label class="nhsuk-label nhsuk-checkboxes__label" for="category-surgical">
Surgical instruments
</label>
</div>

<div class="nhsuk-checkboxes__item">
<input class="nhsuk-checkboxes__input" id="category-monitoring" name="[category]" type="checkbox" value="monitoring">
<label class="nhsuk-label nhsuk-checkboxes__label" for="category-monitoring">
Patient monitoring
</label>
</div>

<div class="nhsuk-checkboxes__item">
<input class="nhsuk-checkboxes__input" id="category-diagnostic" name="[category]" type="checkbox" value="diagnostic">
<label class="nhsuk-label nhsuk-checkboxes__label" for="category-diagnostic">
Diagnostic equipment
</label>
</div>

<div class="nhsuk-checkboxes__item">
<input class="nhsuk-checkboxes__input" id="category-cardiology" name="[category]" type="checkbox" value="cardiology">
<label class="nhsuk-label nhsuk-checkboxes__label" for="category-cardiology">
Cardiology devices
</label>
</div>

<div class="nhsuk-checkboxes__item">
<input class="nhsuk-checkboxes__input" id="category-respiratory" name="[category]" type="checkbox" value="respiratory">
<label class="nhsuk-label nhsuk-checkboxes__label" for="category-respiratory">
Respiratory equipment
<div id="trial-items" class="nhsuk-radios nhsuk-radios--small" data-module="nhsuk-radios" data-nhsuk-radios-init="">
<div class="nhsuk-radios__item">
<input class="nhsuk-radios__input" id="trial-any" name="[trial]" type="radio" value="any" checked="">
<label class="nhsuk-label nhsuk-radios__label" for="trial-any">
Any
</label>
</div>

<div class="nhsuk-checkboxes__item">
<input class="nhsuk-checkboxes__input" id="category-imaging" name="[category]" type="checkbox" value="imaging">
<label class="nhsuk-label nhsuk-checkboxes__label" for="category-imaging">
Imaging systems
</label>
</div>

<div class="nhsuk-checkboxes__item">
<input class="nhsuk-checkboxes__input" id="category-laboratory" name="[category]" type="checkbox" value="laboratory">
<label class="nhsuk-label nhsuk-checkboxes__label" for="category-laboratory">
Laboratory equipment
</label>
</div>

</div>
</fieldset>
</div>

{# NEW: Trust Similarity Filter #}
{# Supplier Size Filter #}
<div class="nhsuk-form-group">
<fieldset class="nhsuk-fieldset">
<legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--s">
Evaluated by trusts like mine
Supplier size
</legend>
<div class="nhsuk-hint" id="trust-hint">
Show products evaluated by trusts similar in size, type, or region
</div>

<div id="trust-items" class="nhsuk-checkboxes nhsuk-checkboxes--small" data-module="nhsuk-checkboxes" data-nhsuk-checkboxes-init="">
<div id="supplier-items" class="nhsuk-checkboxes nhsuk-checkboxes--small" data-module="nhsuk-checkboxes" data-nhsuk-checkboxes-init="">
<div class="nhsuk-checkboxes__item">
<input class="nhsuk-checkboxes__input" id="trust-similar" name="[trust]" type="checkbox" value="similar">
<label class="nhsuk-label nhsuk-checkboxes__label" for="trust-similar">
Similar size to my trust
<input class="nhsuk-checkboxes__input" id="supplier-sme" name="[supplier]" type="checkbox" value="sme">
<label class="nhsuk-label nhsuk-checkboxes__label" for="supplier-sme">
1-50 employees
</label>
</div>


</div>
<div id="supplier-items" class="nhsuk-checkboxes nhsuk-checkboxes--small" data-module="nhsuk-checkboxes" data-nhsuk-checkboxes-init="">
<div class="nhsuk-checkboxes__item">
<input class="nhsuk-checkboxes__input" id="trust-teaching" name="[trust]" type="checkbox" value="teaching">
<label class="nhsuk-label nhsuk-checkboxes__label" for="trust-teaching">
Teaching hospitals
<input class="nhsuk-checkboxes__input" id="supplier-sme" name="[supplier]" type="checkbox" value="sme">
<label class="nhsuk-label nhsuk-checkboxes__label" for="supplier-sme">
51-250 employees
</label>
</div>

<div class="nhsuk-checkboxes__item">
<input class="nhsuk-checkboxes__input" id="trust-region" name="[trust]" type="checkbox" value="region">
<label class="nhsuk-label nhsuk-checkboxes__label" for="trust-region">
In my region
</label>
</div>

<div class="nhsuk-checkboxes__item">
<input class="nhsuk-checkboxes__input" id="trust-specialist" name="[trust]" type="checkbox" value="specialist">
<label class="nhsuk-label nhsuk-checkboxes__label" for="trust-specialist">
Specialist trusts
</label>
</div>

</div>

</fieldset>
</div>

{# Clinical Trial Status Filter #}
{# Supplier Maturity Filter #}
<div class="nhsuk-form-group">
<fieldset class="nhsuk-fieldset">
<legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--s">
Clinical trial status
Supplier maturity
</legend>

<div id="trial-items" class="nhsuk-radios nhsuk-radios--small" data-module="nhsuk-radios" data-nhsuk-radios-init="">
<div class="nhsuk-radios__item">
<input class="nhsuk-radios__input" id="trial-any" name="[trial]" type="radio" value="any" checked="">
<label class="nhsuk-label nhsuk-radios__label" for="trial-any">
Any
<div id="supplier-items" class="nhsuk-checkboxes nhsuk-checkboxes--small" data-module="nhsuk-checkboxes" data-nhsuk-checkboxes-init="">
<div class="nhsuk-checkboxes__item">
<input class="nhsuk-checkboxes__input" id="supplier-sme" name="[supplier]" type="checkbox" value="sme">
<label class="nhsuk-label nhsuk-checkboxes__label" for="supplier-sme">
1-2 years old
</label>
</div>

<div class="nhsuk-radios__item">
<input class="nhsuk-radios__input" id="trial-yes" name="[trial]" type="radio" value="yes">
<label class="nhsuk-label nhsuk-radios__label" for="trial-yes">
Clinical trial available

</div>
<div id="supplier-items" class="nhsuk-checkboxes nhsuk-checkboxes--small" data-module="nhsuk-checkboxes" data-nhsuk-checkboxes-init="">
<div class="nhsuk-checkboxes__item">
<input class="nhsuk-checkboxes__input" id="supplier-sme" name="[supplier]" type="checkbox" value="sme">
<label class="nhsuk-label nhsuk-checkboxes__label" for="supplier-sme">
3-5 years old
</label>
</div>

<div class="nhsuk-radios__item">
<input class="nhsuk-radios__input" id="trial-no" name="[trial]" type="radio" value="no">
<label class="nhsuk-label nhsuk-radios__label" for="trial-no">
No clinical trial
</label>
</div>

</div>
</fieldset>
</div>

{# Supplier Type Filter #}
<div class="nhsuk-form-group">
<fieldset class="nhsuk-fieldset">
<legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--s">
Supplier type
</legend>

<div id="supplier-items" class="nhsuk-checkboxes nhsuk-checkboxes--small" data-module="nhsuk-checkboxes" data-nhsuk-checkboxes-init="">
<div id="supplier-items" class="nhsuk-checkboxes nhsuk-checkboxes--small" data-module="nhsuk-checkboxes" data-nhsuk-checkboxes-init="">
<div class="nhsuk-checkboxes__item">
<input class="nhsuk-checkboxes__input" id="supplier-sme" name="[supplier]" type="checkbox" value="sme">
<label class="nhsuk-label nhsuk-checkboxes__label" for="supplier-sme">
SME
5+ years old
</label>
</div>

<div class="nhsuk-checkboxes__item">
<input class="nhsuk-checkboxes__input" id="supplier-uk" name="[supplier]" type="checkbox" value="uk-made">
<label class="nhsuk-label nhsuk-checkboxes__label" for="supplier-uk">
UK manufactured
</label>
</div>

</div>

</fieldset>
</div>

Expand Down
Loading