From a022aa6f4db3fde79d9e27a184128ae2e6d79a5e Mon Sep 17 00:00:00 2001 From: Mateusz Konieczny Date: Sun, 22 Jan 2023 10:33:55 +0100 Subject: [PATCH 1/6] change DataHub to Datahub --- app/src/frontend/building/data-containers/planning.tsx | 4 ++-- .../obtain_livestream_data_and_load_into_database.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/frontend/building/data-containers/planning.tsx b/app/src/frontend/building/data-containers/planning.tsx index e4786067..1af8f8eb 100644 --- a/app/src/frontend/building/data-containers/planning.tsx +++ b/app/src/frontend/building/data-containers/planning.tsx @@ -79,7 +79,7 @@ const PlanningView: React.FunctionComponent = (props) => { props.building.planning_data.length > 0 ? "Only past application data is currently available for this site" : - "No live planning data are currently available for this building from the Planning London DataHub." + "No live planning data are currently available for this building from the Planning London Datahub." } /> : <> @@ -96,7 +96,7 @@ const PlanningView: React.FunctionComponent = (props) => { props.building.planning_data.length > 0 ? "Only current application data is currently available for this site" : - "No live planning data are currently available for this building from the Planning London DataHub." + "No live planning data are currently available for this building from the Planning London Datahub." } /> : <> diff --git a/etl/planning_data/obtain_livestream_data_and_load_into_database.py b/etl/planning_data/obtain_livestream_data_and_load_into_database.py index f02e0860..bb0bddbf 100644 --- a/etl/planning_data/obtain_livestream_data_and_load_into_database.py +++ b/etl/planning_data/obtain_livestream_data_and_load_into_database.py @@ -66,7 +66,7 @@ def load_data_into_database(cursor, data): "status": status, "status_before_aliasing": status_before_aliasing, "status_explanation_note": status_explanation_note, - "data_source": "the Greater London Authority's Planning London DataHub", + "data_source": "the Greater London Authority's Planning London Datahub", "data_source_link": "https://www.london.gov.uk/programmes-strategies/planning/digital-planning/planning-london-datahub", "address": address_data.planning_data_entry_to_address(entry), } From dc82fef4abe44e8b12152828e4cd9b9c8e52504e Mon Sep 17 00:00:00 2001 From: Mateusz Konieczny Date: Sun, 22 Jan 2023 12:26:03 +0100 Subject: [PATCH 2/6] more accurate description --- .../frontend/building/data-components/planning-data-entry.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/frontend/building/data-components/planning-data-entry.tsx b/app/src/frontend/building/data-components/planning-data-entry.tsx index 5f66b311..177081d3 100644 --- a/app/src/frontend/building/data-components/planning-data-entry.tsx +++ b/app/src/frontend/building/data-components/planning-data-entry.tsx @@ -90,7 +90,7 @@ const PlanningDataOfficialDataEntry: React.FC - Planning application status is streamed using live data uploaded by local authorities to {data[0]["data_source_link"] ? {data[0]["data_source"]} : data[0]["data_source"] }. + Planning application status is streamed data uploaded by local authorities to {data[0]["data_source_link"] ? {data[0]["data_source"]} : data[0]["data_source"] }. From 5dc71a41948dc863be70eea340aa19c2c015be99 Mon Sep 17 00:00:00 2001 From: Mateusz Konieczny Date: Sun, 22 Jan 2023 12:28:30 +0100 Subject: [PATCH 3/6] fix last year map display fixes https://github.com/colouring-cities/colouring-core/issues/12 --- app/src/tiles/dataDefinition.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/tiles/dataDefinition.ts b/app/src/tiles/dataDefinition.ts index 4aa0bcd7..763bc01d 100644 --- a/app/src/tiles/dataDefinition.ts +++ b/app/src/tiles/dataDefinition.ts @@ -154,8 +154,8 @@ const LAYER_QUERIES = { INNER JOIN buildings ON building_properties.building_id = buildings.building_id`, planning_applications_status_recent: `SELECT buildings.geometry_id, building_properties.uprn, building_properties.building_id, planning_data.status AS status, planning_data.uprn, - 1 AS days_since_decision_date, - 1 AS days_since_registered_with_local_authority_date + planning_data.days_since_decision_date_cached AS days_since_decision_date, + planning_data.days_since_registration_cached AS days_since_registered_with_local_authority_date FROM building_properties INNER JOIN planning_data ON building_properties.uprn = planning_data.uprn INNER JOIN buildings ON building_properties.building_id = buildings.building_id`, From b425eec23cb3425d39e120a855c92339c6204803 Mon Sep 17 00:00:00 2001 From: Mateusz Konieczny Date: Mon, 23 Jan 2023 07:11:38 +0100 Subject: [PATCH 4/6] add note as requested in https://github.com/colouring-cities/colouring-london/issues/1049 --- app/src/frontend/building/data-containers/planning.tsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/src/frontend/building/data-containers/planning.tsx b/app/src/frontend/building/data-containers/planning.tsx index 1af8f8eb..848c4e39 100644 --- a/app/src/frontend/building/data-containers/planning.tsx +++ b/app/src/frontend/building/data-containers/planning.tsx @@ -123,6 +123,9 @@ const PlanningView: React.FunctionComponent = (props) => { mode={props.mode} copy={props.copy} /> + + Further improvements to this feature are currently being made. + From 0e55e4d668d803efd653f36b805d913f0c4dd8a6 Mon Sep 17 00:00:00 2001 From: Mateusz Konieczny Date: Sun, 22 Jan 2023 20:08:02 +0100 Subject: [PATCH 5/6] more handholding for new users see https://github.com/colouring-cities/colouring-core/issues/11 --- app/src/frontend/config/data-fields-config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/frontend/config/data-fields-config.ts b/app/src/frontend/config/data-fields-config.ts index dc999d9a..c1173b45 100644 --- a/app/src/frontend/config/data-fields-config.ts +++ b/app/src/frontend/config/data-fields-config.ts @@ -111,7 +111,7 @@ export const buildingUserFields = { community_expected_planning_application: { perUser: true, category: Category.Community, - title: "Do you think that this building may be subject to a planning application, involving demolition, over the next six months?", + title: "Do you think that this building may be subject to a planning application, involving demolition, over the next six months? Tick here to add (or remove) your opinion, to this you need to be in the edit mode.", example: true } }; From 3f34999543ef65e71a27de88f5ff83274cc35632 Mon Sep 17 00:00:00 2001 From: Mateusz Konieczny Date: Sun, 22 Jan 2023 20:14:05 +0100 Subject: [PATCH 6/6] handholding in more readable form --- .../building/data-components/user-opinion-data-entry.tsx | 2 +- app/src/frontend/config/data-fields-config.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/frontend/building/data-components/user-opinion-data-entry.tsx b/app/src/frontend/building/data-components/user-opinion-data-entry.tsx index c0be79f8..c2f7e11f 100644 --- a/app/src/frontend/building/data-components/user-opinion-data-entry.tsx +++ b/app/src/frontend/building/data-components/user-opinion-data-entry.tsx @@ -29,7 +29,7 @@ const UserOpinionEntry: React.FunctionComponent = (props) checked={!!props.userValue} disabled={props.mode === 'view'} onChange={e => props.onChange(props.slug, e.target.checked)} - /> Yes + /> Yes (tick here to add (or remove) your opinion, to this you need to be in the edit mode) ); diff --git a/app/src/frontend/config/data-fields-config.ts b/app/src/frontend/config/data-fields-config.ts index c1173b45..dc999d9a 100644 --- a/app/src/frontend/config/data-fields-config.ts +++ b/app/src/frontend/config/data-fields-config.ts @@ -111,7 +111,7 @@ export const buildingUserFields = { community_expected_planning_application: { perUser: true, category: Category.Community, - title: "Do you think that this building may be subject to a planning application, involving demolition, over the next six months? Tick here to add (or remove) your opinion, to this you need to be in the edit mode.", + title: "Do you think that this building may be subject to a planning application, involving demolition, over the next six months?", example: true } };