-
Notifications
You must be signed in to change notification settings - Fork 1
Update regional interface to add search and vaccines enabled #499
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.
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
Open
johnrimmer2
wants to merge
2
commits into
main
Choose a base branch
from
regional-chnages-oct-25
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| {% extends 'layout.html' %} | ||
|
|
||
| {% set pageName = "Deactivate " + organisation.name %} | ||
| {% set currentSection = "organisations" %} | ||
|
|
||
| {% block header %} | ||
| {% include "includes/header-logged-in-region.html" %} | ||
| {% endblock %} | ||
|
|
||
| {% block beforeContent %} | ||
| {{ backLink({ | ||
| href: "/regions/organisations/" + organisation.id, | ||
| text: "Back" | ||
| }) }} | ||
| {% endblock %} | ||
|
|
||
| {% block content %} | ||
| <div class="nhsuk-grid-row"> | ||
| <div class="nhsuk-grid-column-two-thirds"> | ||
|
|
||
| <h1 class="nhsuk-heading-l">Delete Central Manchester University Hospitals NHS Foundation Trust (RW3)</h1> | ||
|
|
||
| <p>Once you delete this organisation, no one at Central Manchester University Hospitals NHS Foundation Trust will be able to record vaccinations.</p> | ||
|
|
||
| <p>You can add this organisation back at any time.</p> | ||
|
|
||
|
|
||
|
|
||
| <form action="/regions/organisations/{{ organisation.id}}/deactivated" method="post" novalidate="true"> | ||
| {{ button({ | ||
| "text": "Delete organisation", | ||
| classes: "nhsuk-button--warning" | ||
| }) }} | ||
| </form> | ||
|
|
||
| </div> | ||
| </div> | ||
| {% endblock %} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,140 @@ | ||
| {% extends 'layout.html' %} | ||
|
|
||
| {% set pageName = currentRegion.name %} | ||
| {% set currentSection = "organisations" %} | ||
|
|
||
| {% block header %} | ||
| {% include "includes/header-logged-in-region.html" %} | ||
| {% endblock %} | ||
|
|
||
| {% block content %} | ||
| <div class="nhsuk-grid-row"> | ||
| <div class="nhsuk-grid-column-two-thirds"> | ||
|
|
||
| <h1 class="nhsuk-heading-xl">{{ pageName }}</h1> | ||
|
|
||
| <p class="nhsuk-body-l">Invite an organisation to create an NHS Record a vaccination service (RAVS) account.</p> | ||
|
|
||
| <p class="nhsuk-body-l">Once they’re set up, they can add other users and vaccination sites.</p> | ||
|
|
||
|
|
||
| <div class="nhsuk-inset-text"> | ||
| <span class="nhsuk-u-visually-hidden">Information: </span> | ||
| <p class="nhsuk-body-l">You can only delete an organisation if they have not recorded any vaccinations.</p> | ||
| </div> | ||
|
|
||
|
|
||
| {{ button({ | ||
| "text": "Invite an organisation", | ||
| "href": "/regions/add-organisation" | ||
| }) }} | ||
|
|
||
| </div> | ||
| </div> | ||
|
|
||
| <br> | ||
| <h2 class="nhsuk-heading-m">Current organisations</h2> | ||
|
|
||
|
|
||
| <div class="nhsuk-u-margin-top-5"> | ||
| <form action="/user-admin" method="get" novalidate> | ||
| <div class="nhsuk-form-group nhsuk-u-margin-bottom-0"> | ||
| <label class="nhsuk-label" for="q"> | ||
| Search by name or ODS code | ||
| </label> | ||
| <input class="nhsuk-input nhsuk-input--width-20" id="q" name="q" type="search" value="{{ q }}"> | ||
|
|
||
| {{ button({ | ||
| text: "Search", | ||
| classes: "nhsuk-button--secondary nhsuk-u-margin-left-2 app-button--small nhsuk-u-margin-bottom-0" | ||
| })}} | ||
| </div> | ||
| </form> | ||
| </div> | ||
|
|
||
| <br> | ||
|
|
||
|
|
||
|
|
||
| <table class="nhsuk-table-responsive" role="table"> | ||
| <caption class="nhsuk-table__caption"></caption> | ||
| <thead class="nhsuk-table__head" role="rowgroup"> | ||
| <tr role="row"> | ||
| <th scope="col" class="nhsuk-table__header nhsuk-u-width-one-half" role="columnheader">Name</th> | ||
| <th scope="col" class="nhsuk-table__header nhsuk-u-width-one-half" role="columnheader">Vaccines</th> | ||
| <th scope="col" class="nhsuk-table__header nhsuk-u-width-one-eigth" role="columnheader">Status</th> | ||
| <th scope="col" class="nhsuk-table__header nhsuk-u-width-one-eigth" role="columnheader"></th> | ||
|
|
||
|
|
||
| </tr> | ||
| </thead> | ||
| <tbody class="nhsuk-table__body"> | ||
| <tr class="nhsuk-table__row" role="row"> | ||
| <td class="nhsuk-table__cell" role="cell"><span class="nhsuk-table-responsive__heading" aria-hidden="true">Name </span><a>Alder Hey Children's NHS Foundation Trust (RBS)</a></td> | ||
| <td class="nhsuk-table__cell" role="cell"><span class="nhsuk-table-responsive__heading" aria-hidden="true">Vaccines </span>COVID-19, flu, pertussis, RSV, MMR, pneumococcal</td> | ||
| <td class="nhsuk-table__cell" role="cell"><span class="nhsuk-table-responsive__heading" aria-hidden="true">Status</span>Deactivated</td> | ||
| <td class="nhsuk-table__cell" role="cell"><span class="nhsuk-table-responsive__heading" aria-hidden="true">Status</span></td> | ||
|
|
||
| </tr> | ||
| <tr class="nhsuk-table__row" role="row"> | ||
| <td class="nhsuk-table__cell" role="cell"><span class="nhsuk-table-responsive__heading" aria-hidden="true">Name </span><a>Central Manchester University Hospitals NHS Foundation Trust (RW3)</a></td> | ||
| <td class="nhsuk-table__cell" role="cell"><span class="nhsuk-table-responsive__heading" aria-hidden="true">Vaccines </span>COVID-19, flu, pertussis, RSV</td> | ||
| <td class="nhsuk-table__cell" role="cell"><span class="nhsuk-table-responsive__heading" aria-hidden="true">Status</span>Invited</td> | ||
| <td class="nhsuk-table__cell" role="cell"><span class="nhsuk-table-responsive__heading" aria-hidden="true">Status</span> <a href="/regions/delete">Delete</a></td> | ||
|
|
||
| </tr> | ||
| <tr class="nhsuk-table__row" role="row"> | ||
| <td class="nhsuk-table__cell" role="cell"><span class="nhsuk-table-responsive__heading" aria-hidden="true">Name </span><a>Greater Manchester Ambulance Service NHS Trust (RMA)</a></td> | ||
| <td class="nhsuk-table__cell" role="cell"><span class="nhsuk-table-responsive__heading" aria-hidden="true">Vaccines </span>pertussis, RSV</td> | ||
| <td class="nhsuk-table__cell" role="cell"><span class="nhsuk-table-responsive__heading" aria-hidden="true">Status</span>Active</td> | ||
| <td class="nhsuk-table__cell" role="cell"><span class="nhsuk-table-responsive__heading" aria-hidden="true">Status</span></td> | ||
|
|
||
| </tr> | ||
| <tr class="nhsuk-table__row" role="row"> | ||
| <td class="nhsuk-table__cell" role="cell"><span class="nhsuk-table-responsive__heading" aria-hidden="true">Name </span><a>Manchester University NHS Foundation Trust (R0A)</a></td> | ||
| <td class="nhsuk-table__cell" role="cell"><span class="nhsuk-table-responsive__heading" aria-hidden="true">Vaccines </span>COVID-19, flu, pertussis, RSV, MMR, pneumococcal</td> | ||
| <td class="nhsuk-table__cell" role="cell"><span class="nhsuk-table-responsive__heading" aria-hidden="true">Status</span>Invited</td> | ||
| <td class="nhsuk-table__cell" role="cell"><span class="nhsuk-table-responsive__heading" aria-hidden="true">Status</span><a>Delete</a></td> | ||
|
|
||
| </tr> | ||
| <tr class="nhsuk-table__row" role="row"> | ||
| <td class="nhsuk-table__cell" role="cell"><span class="nhsuk-table-responsive__heading" aria-hidden="true">Name </span><a>Norfolk and Norwich University Hospitals NHS Foundation Trust (RM1)</a></td> | ||
| <td class="nhsuk-table__cell" role="cell"><span class="nhsuk-table-responsive__heading" aria-hidden="true">Vaccines </span>pertussis, RSV</td> | ||
| <td class="nhsuk-table__cell" role="cell"><span class="nhsuk-table-responsive__heading" aria-hidden="true">Status</span>Active</td> | ||
| <td class="nhsuk-table__cell" role="cell"><span class="nhsuk-table-responsive__heading" aria-hidden="true">Status</span></td> | ||
|
|
||
| </tr> | ||
| <tr class="nhsuk-table__row" role="row"> | ||
| <td class="nhsuk-table__cell" role="cell"><span class="nhsuk-table-responsive__heading" aria-hidden="true">Name </span><a>North Mersey Community NHS Trust (RES)</a></td> | ||
| <td class="nhsuk-table__cell" role="cell"><span class="nhsuk-table-responsive__heading" aria-hidden="true">Vaccines </span>pertussis, RSV</td> | ||
| <td class="nhsuk-table__cell" role="cell"><span class="nhsuk-table-responsive__heading" aria-hidden="true">Status</span>Active</td> | ||
| <td class="nhsuk-table__cell" role="cell"><span class="nhsuk-table-responsive__heading" aria-hidden="true">Status</span></td> | ||
|
|
||
| </tr> | ||
| <tr class="nhsuk-table__row" role="row"> | ||
| <td class="nhsuk-table__cell" role="cell"><span class="nhsuk-table-responsive__heading" aria-hidden="true">Name </span><a>Royal Papworth Hospital NHS Foundation Trust (RGM)</a></td> | ||
| <td class="nhsuk-table__cell" role="cell"><span class="nhsuk-table-responsive__heading" aria-hidden="true">Vaccines </span>pertussis, RSV</td> | ||
| <td class="nhsuk-table__cell" role="cell"><span class="nhsuk-table-responsive__heading" aria-hidden="true">Status</span>Active</td> | ||
| <td class="nhsuk-table__cell" role="cell"><span class="nhsuk-table-responsive__heading" aria-hidden="true">Status</span></td> | ||
|
|
||
| </tr> | ||
| <tr class="nhsuk-table__row" role="row"> | ||
| <td class="nhsuk-table__cell" role="cell"><span class="nhsuk-table-responsive__heading" aria-hidden="true">Name </span><a>Pickfords pharmacy (FA424)</a></td> | ||
| <td class="nhsuk-table__cell" role="cell"><span class="nhsuk-table-responsive__heading" aria-hidden="true">Vaccines </span>pertussis, RSV</td> | ||
| <td class="nhsuk-table__cell" role="cell"><span class="nhsuk-table-responsive__heading" aria-hidden="true">Status</span>Active</td> | ||
| <td class="nhsuk-table__cell" role="cell"><span class="nhsuk-table-responsive__heading" aria-hidden="true">Status</span></td> | ||
|
|
||
| </tr> | ||
|
|
||
| </tbody> | ||
| </table> | ||
|
|
||
|
|
||
| <p><a>View 2 closed organisations</a></p> | ||
|
|
||
|
|
||
| {% if closedOrganisationsCount > 0 %} | ||
| <p><a href="/regions/organisations/closed">View {{ closedOrganisationsCount | plural("closed organisation") }}</a></p> | ||
| {% endif %} | ||
|
|
||
| {% endblock %} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note to myself: make this page dynamic