a_adli/colouring-montreal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1066 from matkoniecz/fix/assorted-fixes

Browse Source 
assorted fixes
This commit is contained in:
Mike Simpson 2023-01-23 11:21:59 +00:00 committed by GitHub
commit 9c1e22663e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/frontend/building/data-components/planning-data-entry.tsx
View File

@ -90,7 +90,7 @@ const PlanningDataOfficialDataEntry: React.FC<PlanningDataOfficialDataEntryProps
{/* TODO: data[0] is problematic here... Compute it from listed elements and show all distinct variants? Error if they are not distinct? Hardcode it? */} {/* TODO: data[0] is problematic here... Compute it from listed elements and show all distinct variants? Error if they are not distinct? Hardcode it? */}
<div> <div>
<i> <i>
Planning application status is streamed using live data uploaded by local authorities to {data[0]["data_source_link"] ? <a href={data[0]["data_source_link"]}>{data[0]["data_source"]}</a> : data[0]["data_source"] }. Planning application status is streamed data uploaded by local authorities to {data[0]["data_source_link"] ? <a href={data[0]["data_source_link"]}>{data[0]["data_source"]}</a> : data[0]["data_source"] }.
</i> </i>
</div> </div>
<Disclaimer /> <Disclaimer />

2
app/src/frontend/building/data-components/user-opinion-data-entry.tsx
View File

@ -29,7 +29,7 @@ const UserOpinionEntry: React.FunctionComponent<UserOpinionEntryProps> = (props)
checked={!!props.userValue} checked={!!props.userValue}
disabled={props.mode === 'view'} disabled={props.mode === 'view'}
onChange={e => props.onChange(props.slug, e.target.checked)} 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)
</label> </label>
</> </>
); );

7
app/src/frontend/building/data-containers/planning.tsx
View File

@ -79,7 +79,7 @@ const PlanningView: React.FunctionComponent<CategoryViewProps> = (props) => {
props.building.planning_data.length > 0 ? props.building.planning_data.length > 0 ?
"Only past application data is currently available for this site" "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<CategoryViewProps> = (props) => {
props.building.planning_data.length > 0 ? props.building.planning_data.length > 0 ?
"Only current application data is currently available for this site" "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."
} }
/> />
: <></> : <></>
@ -123,6 +123,9 @@ const PlanningView: React.FunctionComponent<CategoryViewProps> = (props) => {
mode={props.mode} mode={props.mode}
copy={props.copy} copy={props.copy}
/> />
<InfoBox type='warning'>
Further improvements to this feature are currently being made.
</InfoBox>
</DataEntryGroup> </DataEntryGroup>
</DataEntryGroup> </DataEntryGroup>
<DataEntryGroup name="Planning zones" collapsed={true} > <DataEntryGroup name="Planning zones" collapsed={true} >

4
app/src/tiles/dataDefinition.ts
View File

@ -154,8 +154,8 @@ const LAYER_QUERIES = {
INNER JOIN buildings ON building_properties.building_id = buildings.building_id`, INNER JOIN buildings ON building_properties.building_id = buildings.building_id`,
planning_applications_status_recent: `SELECT planning_applications_status_recent: `SELECT
buildings.geometry_id, building_properties.uprn, building_properties.building_id, planning_data.status AS status, planning_data.uprn, buildings.geometry_id, building_properties.uprn, building_properties.building_id, planning_data.status AS status, planning_data.uprn,
1 AS days_since_decision_date, planning_data.days_since_decision_date_cached AS days_since_decision_date,
1 AS days_since_registered_with_local_authority_date planning_data.days_since_registration_cached AS days_since_registered_with_local_authority_date
FROM building_properties FROM building_properties
INNER JOIN planning_data ON building_properties.uprn = planning_data.uprn INNER JOIN planning_data ON building_properties.uprn = planning_data.uprn
INNER JOIN buildings ON building_properties.building_id = buildings.building_id`, INNER JOIN buildings ON building_properties.building_id = buildings.building_id`,

2
etl/planning_data/obtain_livestream_data_and_load_into_database.py
View File

@ -66,7 +66,7 @@ def load_data_into_database(cursor, data):
"status": status, "status": status,
"status_before_aliasing": status_before_aliasing, "status_before_aliasing": status_before_aliasing,
"status_explanation_note": status_explanation_note, "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", "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), "address": address_data.planning_data_entry_to_address(entry),
} }