Skip to content
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

jersey-joins-epilepsy12 #1105

Merged
merged 23 commits into from
Jan 23, 2025
Merged
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
d871fe6
A Jersey .shp files from `https://gadm.org/download_country.html`
eatyourpeas Nov 23, 2024
6dc8123
too big a commit - sorry
eatyourpeas Nov 23, 2024
6abbd8f
now loads home page without maps for jersey after multiple messy work…
eatyourpeas Nov 23, 2024
ae52abb
ok start again, redo the migrations, this time map jersey layer to co…
eatyourpeas Nov 23, 2024
96363ac
now maps working. filter country map to individual country. remap sri…
eatyourpeas Nov 23, 2024
1757cf3
fixed maps
eatyourpeas Nov 23, 2024
d25a676
rejig templates to remove levels of abstraction for Jersey
eatyourpeas Nov 23, 2024
346ba23
fix scatter plot of cases to exclude those without postcode or geogra…
eatyourpeas Nov 23, 2024
3f2f877
add search field for trusts in admin, add URN to Case model, check fo…
eatyourpeas Nov 23, 2024
357890c
create patient form, add urn to model, update form template - still n…
eatyourpeas Nov 23, 2024
298d722
filter by URN, fix E12CaseFactory for Jersey, heading in case table
eatyourpeas Nov 24, 2024
65c8309
fix seed functions for jersey postcodes and URNs. Fix holes in the Ca…
eatyourpeas Nov 24, 2024
6eb4449
typo and test commit
eatyourpeas Nov 24, 2024
211e0f9
validate jersey postcodes, prevent geocode lookup for jersey since, w…
eatyourpeas Nov 24, 2024
3fb2de2
documentation updates and fixes esp postcodes, imd and mapping
eatyourpeas Nov 24, 2024
5b7e022
accepting all suggestions
eatyourpeas Dec 3, 2024
dfe3bda
add migration
eatyourpeas Dec 3, 2024
fc3d5eb
Merge branch 'live' into eatyourpeas/issue1100
eatyourpeas Jan 18, 2025
23db5c1
move migrations to temp
eatyourpeas Jan 20, 2025
0771c28
Merge branch 'live' into eatyourpeas/issue1100
eatyourpeas Jan 20, 2025
0948a05
reorder migrations
eatyourpeas Jan 20, 2025
9dda236
template edits to incorporate jersey
eatyourpeas Jan 20, 2025
c4d853d
remove extraneous print statements for debugging
eatyourpeas Jan 23, 2025
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
Prev Previous commit
Next Next commit
rejig templates to remove levels of abstraction for Jersey
eatyourpeas committed Nov 23, 2024

Verified

This commit was signed with the committer’s verified signature.
eatyourpeas Simon Chapman
commit d25a6761fadc816b4d3a2f5c869ed35136647fb4
12 changes: 9 additions & 3 deletions templates/epilepsy12/partials/selected_organisation_summary.html
Original file line number Diff line number Diff line change
@@ -344,6 +344,9 @@ <h3>{{selected_organisation}}
<div class="sixteen wide right fluid column">
<div class="ui three stackable cards">

{% if selected_organisation.country.name != "Jersey" %}

<!-- Trust of Local Health Board tile -->
<div class="ui rcpch_light_blue fluid card">
<div class="content">
<!-- ENGLISH ORG -->
@@ -361,17 +364,17 @@ <h3>
</h3>

<!-- WELSH ORG -->
{% else %}
{% elif selected_organisation.local_health_board %}
<h3>Local Health Board</h3>
{% endif %}
</div>
<div>
{% if selected_organisation.trust %}
{% if selected_organisation.trust %}
<div
id="icb_map"
style="width:100%;height:600px;"
></div>
{% else %}
{% elif selected_organisation.local_health_board %}
<div
id="lhb_map"
style="width:100%;height:600px;"
@@ -383,6 +386,7 @@ <h3>Local Health Board</h3>
</div>
</div>

<!-- NHS England Region tile -->
{% if selected_organisation.trust %}
<div class="ui rcpch_light_blue fluid card">
<div class="content">
@@ -408,6 +412,8 @@ <h3>
<!-- leave a blank space in welsh orgs -->
{% endif %}

{% endif %}

<div class="ui rcpch_light_blue fluid card">
<div class="content">
<h3>