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

smarter display of 'only current/past data' case

Browse Source
This commit is contained in:
Mateusz Konieczny 2022-12-22 08:24:06 +01:00
parent 3172a394d9
commit 861164124c
2 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,7 +18,7 @@ interface PlanningDataOfficialDataEntryProps {
data_source_link?: string;
address?: string;
}[];
allEntryCount: number,
messageOnMissingData: string,
}
const {useState} = React;
@ -76,25 +76,14 @@ const StatusInfo = ({status, statusBeforeAliasing}) => {
const PlanningDataOfficialDataEntry: React.FC<PlanningDataOfficialDataEntryProps> = (props) => {
const data = props.shownData || [];
if(data.length == 0) {
if (props.allEntryCount == 0) {
return (<Fragment>
<div className={`alert alert-dark`} role="alert" style={{ fontSize: 13, backgroundColor: "#f6f8f9" }}>
<Disclaimer />
</div>
<InfoBox type='success'>
No live planning data are currently available for this building from the Planning London DataHub.
{props.messageOnMissingData}
</InfoBox>
</Fragment>);
} else {
return (<Fragment>
<div className={`alert alert-dark`} role="alert" style={{ fontSize: 13, backgroundColor: "#f6f8f9" }}>
<Disclaimer />
</div>
<InfoBox type='success'>
No live planning data for this date range, but this building has associated planning data not shown here.
</InfoBox>
</Fragment>);
}
}
return <>
<div className={`alert alert-dark`} role="alert" style={{ fontSize: 13, backgroundColor: "#f6f8f9"}}>

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

@ -68,19 +68,35 @@ const PlanningView: React.FunctionComponent<CategoryViewProps> = (props) => {
To comment on an application follow the application link if provided, or visit the relevant local authority's planning page.
</InfoBox>
<PlanningDataOfficialDataEntry
shownData={props.building.planning_data ? props.building.planning_data.filter(item => isArchived(item) == false) : []}
allEntryCount={props.building.planning_data ? props.building.planning_data.length : 0}
/>
{props.building.planning_data ?
<PlanningDataOfficialDataEntry
shownData={props.building.planning_data.filter(item => isArchived(item) == false)}
messageOnMissingData={
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."
}
/>
: <></>
}
</DataEntryGroup>
<DataEntryGroup name="Past applications (official data)" collapsed={true} >
<InfoBox>
This section provides data on past applications where available from the GLA, including those with no decision in over a year
</InfoBox>
<PlanningDataOfficialDataEntry
shownData={props.building.planning_data ? props.building.planning_data.filter(item => isArchived(item)) : []}
allEntryCount={props.building.planning_data ? props.building.planning_data.length : 0}
/>
{props.building.planning_data ?
<PlanningDataOfficialDataEntry
shownData={props.building.planning_data.filter(item => isArchived(item))}
messageOnMissingData={
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."
}
/>
: <></>
}
</DataEntryGroup>
<DataEntryGroup name="Possible future applications (crowdsourced data)" collapsed={true} >
<InfoBox type='info'>Click and colour buildings here if you think they may be subject to a future planning application involving demolition. To add your opinion on how well this building works, please also visit the <Link to={communityLinkUrl}>Community</Link> section.</InfoBox>