add counties page

What was previously ward -> local authority is now a ward -> local
authority -> county. County only covers rural counties and not
metropolitan boroughs and other unitary authorities. Previously, there
was a page full of local authorities (unitary authorities and
districts), and each one of those would have a list of electoral wards.
However, now there are counties that contain a list of districts - so
this needs a new page - a checkbox for "select the county" and then a
list of links to district pages.

If you want to select multiple districts, you'll need to go into each
one of those sub-sections in turn and click select all.

Needed to tweak the query to retrieve the list of areas in a list for a
library. Previously, it just returned anything at top level (ie: didn't
have a parent). However, rural districts now have parents (the rural
counties themselves). So the query now returns "everything that isn't a
leaf node", or in more specific terms, everything that has at least
other row referring to it as a parent. So no electoral wards, since
they dont have any children, but yes to districts and counties.
This commit is contained in:
Leo Hemsted
2020-09-04 15:22:32 +01:00
parent c421e14d69
commit 256d2b2b60
6 changed files with 168 additions and 11 deletions

View File

@@ -44,7 +44,7 @@ class BroadcastArea(SortableMixin):
BroadcastAreasRepository().get_simple_polygons_for_area(self.id)
)
@property
@cached_property
def sub_areas(self):
return [
BroadcastArea(row)

View File

@@ -166,11 +166,16 @@ class BroadcastAreasRepository(object):
return areas
def get_all_areas_for_library(self, library_id):
# only interested in areas with children - local authorities, counties, unitary authorities. not wards.
q = """
SELECT id, name
FROM broadcast_areas
JOIN (
SELECT DISTINCT broadcast_area_library_group_id
FROM broadcast_areas
WHERE broadcast_area_library_group_id IS NOT NULL
) AS parent_broadcast_areas ON parent_broadcast_areas.broadcast_area_library_group_id = broadcast_areas.id
WHERE broadcast_area_library_id = ?
AND broadcast_area_library_group_id IS NULL
"""
results = self.query(q, library_id)

View File

@@ -160,8 +160,10 @@ def choose_broadcast_sub_area(service_id, broadcast_message_id, library_slug, ar
)
area = BroadcastMessage.libraries.get_areas(area_slug)[0]
is_county = any(sub_area.sub_areas for sub_area in area.sub_areas)
form = BroadcastAreaFormWithSelectAll.from_library(
area.sub_areas,
[] if is_county else area.sub_areas,
select_all_choice=(area.id, f'All of {area.name}'),
)
if form.validate_on_submit():
@@ -171,6 +173,20 @@ def choose_broadcast_sub_area(service_id, broadcast_message_id, library_slug, ar
service_id=current_service.id,
broadcast_message_id=broadcast_message.id,
))
if is_county:
# area = county. sub_areas = districts. they have wards, so link to individual district pages
return render_template(
'views/broadcast/counties.html',
form=form,
search_form=SearchByNameForm(),
show_search_form=(len(area.sub_areas) > 7),
library_slug=library_slug,
page_title=f'Choose an area of {area.name}',
broadcast_message=broadcast_message,
county=area,
)
return render_template(
'views/broadcast/sub-areas.html',
form=form,

View File

@@ -0,0 +1,42 @@
{% from "components/page-header.html" import page_header %}
{% from "components/live-search.html" import live_search %}
{% from "components/page-footer.html" import sticky_page_footer %}
{% from "components/form.html" import form_wrapper %}
{% extends "withnav_template.html" %}
{% block service_page_title %}
{{ page_title }}
{% endblock %}
{% block maincolumn_content %}
{{ page_header(
page_title,
back_link=url_for('.choose_broadcast_library', service_id=current_service.id, broadcast_message_id=broadcast_message.id),
)}}
{% call form_wrapper() %}
<div class="form-group govuk-!-margin-bottom-4">
{{ form.select_all }}
</div>
{{ live_search(target_selector='.file-list-item', show=show_search_form, form=search_form, label='Or by district') }}
{% for area in county.sub_areas|sort %}
<div class="file-list-item">
{# these are districts within a county#}
<a
class="file-list-filename-large govuk-link govuk-link--no-visited-state"
href="{{ url_for('.choose_broadcast_sub_area', service_id=current_service.id, broadcast_message_id=broadcast_message.id, library_slug=library_slug, area_slug=area.id) }}"
>{{ area.name }}</a>
</div>
{% endfor %}
{{ sticky_page_footer('Add to broadcast') }}
{% endcall %}
{% endblock %}