Display local council boundaries and add some basic council data #506
Conversation
This file contains 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
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #506 +/- ##
==========================================
- Coverage 82.50% 82.11% -0.39%
==========================================
Files 104 105 +1
Lines 3440 3483 +43
Branches 347 359 +12
==========================================
+ Hits 2838 2860 +22
- Misses 515 532 +17
- Partials 87 91 +4 ☔ View full report in Codecov by Sentry. |
zarino
reviewed
Mar 14, 2024
| @@ -120,9 +120,11 @@ <h3 class="h5"><a href="{% url 'area' area_type=overlap_constituency.old_area.ar | |||
| </a> | |||
| </li> | |||
| {% endif %} | |||
| {% if is_westminster_cons %} | |||
There was a problem hiding this comment.
Would be nice if this was two-space indented, like the conditional above ;-)
(I try to always do this inside Django templates, as per the "suggestion" in https://pages.mysociety.org/coding-standards.html)
1 task
struan
force-pushed
the
487-display-local-councils
branch
3 times, most recently
from
0d146c4 to
165bd4d
Compare
zarino
approved these changes
Apr 8, 2024
There was a problem hiding this comment.
Overall looks good 👍 Two small things:
There’s too much vertical space above the public opinion section, on council area pages, because the (empty) MP section is still there in the markup. Any way we could skip printing that section entirely, if we’re on a council page?
And is there any way we can get a filter in the DataSet admin, to filter by council type(s)?
struan
force-pushed
the
487-display-local-councils
branch
2 times, most recently
from
00793df to
06ec6ad
Compare
Corrects headers according to what's displayed. Sorts by Council or Constituency name as appropriate. Make sure GSS codes can be displayed for councils.
There is no point repeating the dataset’s label in its description. If the import script does not set a description, the dataset shouldn’t have one.
Fixes #504. AreaSearchView no longer artificially limits results to WMC area_types, and area_search.html presents matching areas grouped by area_type. I’ve gone with a custom `grid` layout on the area_search.html (rather than Bootstrap columns) to more gracefully handle a variable number of columns – there might be 1, 2, or 3, depending on the search input. I also fixed a bug in the `highlight` filter, which raised a TypeError when passed a None `search` parameter. `search` is None when the user has used geolocation rather than submitting a search term.
-"select button" display the area name + description. -"select button" Opens a modal displaying the area option with an description for each one of them. -Button content is updated when user selects an option.
This prevents “MP” showing as an always-empty column when you’re exploring by local authority. I implemented this as an `areaTypeHasMP()` method, because `selectableDatasets`` changes when you enter search text, and I don’t want all of the columns to appear/disappear as you search. While I was there, I also took the opportunity to refactor the four separate “Loading datasets…” status messages into a single, centred one.
use a lookup for the cons column if present
move range display into include allow a range related dataset for datasets
This is mostly for launch day
Not clear why it was ever using file.get to set the area type as it's never had an area_type key. Changed to using the area_type of the importer as that's the correct thing.
struan
force-pushed
the
487-display-local-councils
branch
from
f0e8006 to
f983cff
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This adds local council boundaries to the map along with imports for the population and the type so there is some data there. It also makes minimal changes to the area page for local councils.