Split single tier types #707
Merged
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
struan
approved these changes
Nov 18, 2024
…_type Fixes #611. Adds a new “Advanced filter” for “Single Tier authority type”, allowing users to filter the homepage scorecard table down to just Metropolitan Districts, for example, or just London Boroughs.
Just a small code quality improvement I spotted while implementing the Single Tier authority_type filtering. Use the group slugs and authority types in Council.SCORING_GROUPS in Council.get_scoring_group() instead of repeating them manually. Less chance of the two falling out of sync.
We previously used `authority_type` in a number of places, when really we were referring to Scorecards scoring groups (eg: "Single Tier"), not a council’s _actual_ MapIt `authority_type` as the name might imply. We also sometimes used the term `council_group` for the same thing. Sigh. This commit is an attempt to disambiguate all those `authority_type` and `council_group` references, so that now, whenever we’re talking about a Scorecards scoring group, we call it `scoring_group` and we pass the group’s full object from Council.SCORING_GROUPS, not just its slug. This involved a number of fiddly changes. including: - Removing `caps/includes/authority_type.html` and using `scoring/includes/scoring-group-name.html` instead. - Replacing `context["authority_type"]` with `context["scoring_group"]` in all post-2022 views and templates. - Replacing `council_group` with `scoring_group` in `PlanSection.get_average_scores` and `PlanQuestion.get_scores_breakdown`. - …And while I was there, I also noticed that `PlanQuestion.get_average_scores` wasn’t called anywhere, so I removed it.
Remove incorrect checking for None and just use the description
zarino
force-pushed
the
611-split-single-tier-types
branch
from
cc7f7c0
to
d1ca74f
Compare
|
Thanks @struan! I spotted that very cludgey filter description appending behaviour but didn’t want to get even further into the weeds fixing it. Glad you did it instead of me! 🤣 |
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.
Fixes #611.
Adds an "Advanced filter" for
authority_type, on the Single Tier scorecard.While I was there, I also fixed a long-standing code smell, where we had been using
authority_typeto refer to both actual MapIt council authority types (eg: "UTA", "DIS", "CTY") and Scorecards scoring groups (eg: "single-tier").This makes the PR look much more complex than it actually is. Best to review each commit separately!