From d0c331a3106172d46a8f973a89100b63470a750a Mon Sep 17 00:00:00 2001 From: Struan Donald Date: Tue, 12 Dec 2023 16:31:52 +0000 Subject: [PATCH] WIP using new area page for area page --- hub/templates/hub/area/_json_data.html | 49 +++ hub/templates/hub/new_area_page.html | 406 ++++++++----------------- hub/tests/test_views.py | 10 +- hub/views/area.py | 13 +- 4 files changed, 190 insertions(+), 288 deletions(-) create mode 100644 hub/templates/hub/area/_json_data.html diff --git a/hub/templates/hub/area/_json_data.html b/hub/templates/hub/area/_json_data.html new file mode 100644 index 000000000..fca0948d2 --- /dev/null +++ b/hub/templates/hub/area/_json_data.html @@ -0,0 +1,49 @@ +{% load humanize %} +{% if dataset.name.lower == "results of last election" %} + + + + + + + + + {% for data in dataset.data.value.results|dictsortreversed:"votes" %} + {% if data.votes != 0 %} + + + + + {% endif %} + {% endfor %} + +
PartyVotes
{{ data.party }}{{ data.votes }}
+{% elif dataset.name.lower == "popular petitions" %} + + + + + + + + + {% for petition in dataset.data.value %} + + + + + {% endfor %} + +
PetitionSignatures
{{ petition.action }}{{ petition.signatures }}
+{% elif dataset.subcategory == "groups" %} +
{{ dataset.label }}
+ +{% endif %} diff --git a/hub/templates/hub/new_area_page.html b/hub/templates/hub/new_area_page.html index 72edf30b0..d13d0ce1d 100644 --- a/hub/templates/hub/new_area_page.html +++ b/hub/templates/hub/new_area_page.html @@ -226,336 +226,190 @@

Date elected

+ {% if categories.opinion %}

Public opinion

-
-
-

Tackling climate change should be one of the Government’s biggest priorities right now

-
- -
-
-
-

53%

-

57% national average

-
-
-

Data from Focaldata 2023 MRP polling for HOPE not hate. Not to be publicly shared.

-
-
- -
-
-

Likely to take action such as voting for a particular candidate or lobbying an MP to tackle climate change and protect nature

-
- -
-
-
-

36%

-

39% national average

-
-
-

Data from Focaldata 2023 MRP polling for HOPE not hate. Not to be publicly shared.

-
-
- -
+ {% for dataset in categories.opinion %} + {% if dataset.is_range or dataset.data_type == "json" %} +
+ {% else %} +
+ {% endif %}
-

Vote share at last election

+

{{ dataset.label }}

+ {% if dataset.data_type == "json" %} + {% include 'hub/area/_json_data.html' with dataset=dataset %} + {% elif dataset.is_range %} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + {% for row in dataset.data %} + + + + + + {% endfor %} +
Party%Votes
Conservative Party49%20488
Labour Party40%16312
Reform UK4%1749
Liberal Democrats4%1525
Other2%929
Green Party of England and Wales1%596
AnswerNational Average
{{ row.label }}{{ row.value|floatformat }}%{{ row.average|floatformat }}%
+ {% else %} +

{{ dataset.data.value|floatformat }}%

+

{{dataset.data.average|floatformat }}% national average

+ {% endif %}
-

2019-12-12 election results from UK Parliament.

-
-
- -
-
-

Policies for tackling the cost of living crisis should go hand in hand with policies to tackle the climate crisis

-
- -
-
-
-

55%

-

58% national average

-
-
-

Data from Focaldata 2023 MRP polling for HOPE not hate. Not to be publicly shared.

-
-
- -
-
-

Voted to leave the European Union

-
- -
-
-
-

61%

-

51.8% national average

-
-
-

Data from UK Parliament.

-
-
- -
-
-

Consider climate change a high priority

-
- -
-
-
-

50%

-

53.9% national average

-
-
-

Data from Public First, commissioned by Onward UK.

+

{{ dataset.source }}

- + {% endfor %}
+
- More public opinion data + More Public Opinion data {% include "hub/includes/icons/chevron-right.html" %}
+ {% endif %} + {% if categories.place %}

Place

-
-
-

Households in fuel poverty

-
- -
-
-
-

24.9%

-

21.6% national average

-
-
-

Data from End Fuel Poverty Coalition.

-
-
- -
-
-

Child poverty

-
- -
-
-
-

24.4%

-

28.2% national average

-
-
-

Data from End Child Poverty.

-
-
- -
+ {% for dataset in categories.place %} + {% if dataset.is_range and dataset.data|length > 9 %} +
+ {% elif dataset.is_range or dataset.data_type == "json" %} +
+ {% else %} +
+ {% endif %}
-

Socio-economic status

+

{{ dataset.label }} {{ dataset.data_type }} {{ dataset.data|length }}

+ {% if dataset.data_type == "json" %} + {% include 'hub/area/_json_data.html' with dataset=dataset %} + {% elif dataset.data_type == "text" %} +

{{ dataset.data.value|safe }}

+ {% elif dataset.is_range %} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + {% for row in dataset.data %} + + + + + + {% endfor %} +
StatusThis areaUK average
Full-time students29.3%7.4%
Higher managerial, administrative and professional occupations10.5%12.9%
Intermediate occupations8.0%11.5%
Lower managerial, administrative and professional occupations15.3%19.9%
Lower supervisory and technical occupations3.3%5.5%
Never worked / long-term unemployed10.9%8.5%
Routine occupations9.4%12.2%
Semi-routine occupations7.8%11.5%
Small employers and own account workers5.5%10.6%
This areaUK Average
+ {{ row.label|html_format_dataset_name|safe }} + {{ row.value|floatformat }}%{{ row.average|floatformat }}%
+ {% else %} +

{{ dataset.data.value|floatformat }}%

+

{{dataset.data.average|floatformat }}% national average

+ {% endif %}
-

Data from House of Commons Library.

+

{{ dataset.source }}

+ {% endfor %} +
-
-
-

Air pollution

-
- -
-
-
-

High

-

Above average NO2

-
-
-

Data from Defra.

-
-
+
+ + More Place data + {% include "hub/includes/icons/chevron-right.html" %} + +
+
+ {% endif %} -
-
-

Flood risk

-
- -
-
-
-

High

-

42% of this area is at high risk of flooding

-
-
-

Flood risk from rivers or sea. Data from Defra.

-
-
-
-
-

Index of Multiple Deprivation

-
- -
-
-
-

2

-

Very deprived

-
-
-

Data from mySociety.

-
-
+
+

Movement

+
-
+ {% for dataset in categories.movement %} + {% if dataset.is_range and dataset.data|length > 9 %} +
+ {% elif dataset.is_range or dataset.data_type == "json" %} +
+ {% else %} +
+ {% endif %}
-

Country of the UK

+

{{ dataset.label }}

-

England

+ {% if dataset.data_type == "json" %} + {% include 'hub/area/_json_data.html' with dataset=dataset %} + {% elif dataset.data_type == "percentage" %} +

{{ dataset.data.value|floatformat }}%

+

{{dataset.data.average|floatformat }}% national average

+ {% elif dataset.data_type == "integer" %} +

{{ dataset.data.value }}

+

{{dataset.data.average|floatformat }} national average

+ {% elif dataset.is_range %} + + + + + + + + + + {% for row in dataset.data %} + + + + + + {% endfor %} + +
This areaUK Average
+ {{ row.label|html_format_dataset_name|safe }} + {{ row.value|floatformat }}%{{ row.average|floatformat }}%
+ {% else %} +

{{ dataset.data.value|safe }}

+ {% endif %}
-

Data from mySociety.

+

{{ dataset.source }}

- -
-
- - More place data - {% include "hub/includes/icons/chevron-right.html" %} - -
-
- -
-

Movement

-
- + {% endfor %}

Friends of the Earth activists

diff --git a/hub/tests/test_views.py b/hub/tests/test_views.py index 59d4af201..e5c8798df 100644 --- a/hub/tests/test_views.py +++ b/hub/tests/test_views.py @@ -185,7 +185,7 @@ def test_area_page(self): url = reverse("area", args=("WMC", "South Borsetshire")) response = self.client.get(url) self.assertEqual(response.status_code, 200) - self.assertTemplateUsed(response, "hub/area.html") + self.assertTemplateUsed(response, "hub/new_area_page.html") context = response.context self.assertEqual(context["page_title"], "South Borsetshire") @@ -238,7 +238,7 @@ def test_postcode_lookup(self, mapit_areas): response = self.client.get(url, {"search": "SE17 3HE"}, follow=True) self.assertRedirects(response, "/area/WMC/South%20Borsetshire") - self.assertTemplateUsed(response, "hub/area.html") + self.assertTemplateUsed(response, "hub/new_area_page.html") context = response.context self.assertEqual(context["area"].name, "South Borsetshire") @@ -268,7 +268,7 @@ def test_latlon_lookup(self, mapit_areas): response = self.client.get(url, {"lat": "0.11", "lon": "0.12"}, follow=True) self.assertRedirects(response, "/area/WMC/South%20Borsetshire") - self.assertTemplateUsed(response, "hub/area.html") + self.assertTemplateUsed(response, "hub/new_area_page.html") context = response.context self.assertEqual(context["area"].name, "South Borsetshire") @@ -278,7 +278,7 @@ def test_area_name_lookup(self): response = self.client.get(url, {"search": "South Borsetshire"}, follow=True) self.assertRedirects(response, "/area/WMC/South%20Borsetshire") - self.assertTemplateUsed(response, "hub/area.html") + self.assertTemplateUsed(response, "hub/new_area_page.html") context = response.context self.assertEqual(context["area"].name, "South Borsetshire") @@ -288,7 +288,7 @@ def test_mp_name_lookup(self): response = self.client.get(url, {"search": "James Madeupname"}, follow=True) self.assertRedirects(response, "/area/WMC/South%20Borsetshire") - self.assertTemplateUsed(response, "hub/area.html") + self.assertTemplateUsed(response, "hub/new_area_page.html") context = response.context self.assertEqual(context["area"].name, "South Borsetshire") diff --git a/hub/views/area.py b/hub/views/area.py index 82f31f274..8d09d1bb5 100644 --- a/hub/views/area.py +++ b/hub/views/area.py @@ -1,4 +1,3 @@ -import random from collections import defaultdict from django.db.models import Count, OuterRef, Subquery @@ -65,6 +64,8 @@ def process_dataset(self, data_set): "source_url": data_set.source_url, "category": data_set.category, "pk": data_set.pk, + "data_type": data_set.data_type, + "featured": data_set.featured, } if data_set.is_range: data["is_range"] = True @@ -108,7 +109,7 @@ def process_dataset(self, data_set): class AreaView(BaseAreaView): model = Area - template_name = "hub/area.html" + template_name = "hub/new_area_page.html" context_object_name = "area" def get_tags(self, mp_data, area_data): @@ -387,12 +388,10 @@ class NewAreaPageView(TitleMixin, TemplateView): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) - context["area"] = { - "name": "Borsetshire South", - } + area = Area.objects.get(name="North East Fife", area_type__code="WMC") + context["area"] = area - person_pks = Person.objects.values_list("pk", flat=True) - mp = Person.objects.get(pk=random.choice(person_pks)) + mp = Person.objects.get(area=area) mp_data = PersonData.objects.filter(person=mp).select_related("data_type") context["mp"] = {"person": mp} for item in mp_data.all():