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

set up current_landuse_source like date_source

Browse Source
This commit is contained in:
Ed Chalstrey 2022-05-12 16:30:55 +01:00
parent 694335cf3b
commit b46f637911
2 changed files with 129 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

189
app/src/frontend/building/data-containers/use.tsx
View File

@ -14,77 +14,128 @@ import Verification from '../data-components/verification';
/** /**
* Use view/edit section * Use view/edit section
*/ */
const UseView: React.FunctionComponent<CategoryViewProps> = (props) => ( const UseView: React.FunctionComponent<CategoryViewProps> = (props) => {
<Fragment> if (props.building.current_landuse_source == "Expert/personal knowledge of building" ||
<InfoBox msg="93% of properties in UK are dwellings so we have set this as the default colour. Can you help us colour-in all non-residential and mixed use buildings, and verify residential buildings too?"></InfoBox> props.building.current_landuse_source == "Online streetview image" ||
<MultiDataEntry props.building.current_landuse_source == null
title={dataFields.current_landuse_group.title} ){
slug="current_landuse_group" return (
value={props.building.current_landuse_group} <Fragment>
mode={props.mode} <InfoBox msg="93% of properties in UK are dwellings so we have set this as the default colour. Can you help us colour-in all non-residential and mixed use buildings, and verify residential buildings too?"></InfoBox>
copy={props.copy} <MultiDataEntry
onChange={props.onChange} title={dataFields.current_landuse_group.title}
confirmOnEnter={true} slug="current_landuse_group"
tooltip={dataFields.current_landuse_group.tooltip} value={props.building.current_landuse_group}
placeholder="Type new land use group here" mode={props.mode}
copyable={true} copy={props.copy}
autofill={true} onChange={props.onChange}
showAllOptionsOnEmpty={true} confirmOnEnter={true}
/> tooltip={dataFields.current_landuse_group.tooltip}
<Verification placeholder="Type new land use group here"
slug="current_landuse_group" copyable={true}
allow_verify={props.user !== undefined && props.building.current_landuse_group !== null && !props.edited} autofill={true}
onVerify={props.onVerify} showAllOptionsOnEmpty={true}
user_verified={props.user_verified.hasOwnProperty("current_landuse_group")} />
user_verified_as={props.user_verified.current_landuse_group && props.user_verified.current_landuse_group.join(", ")} <Verification
verified_count={props.building.verified.current_landuse_group} slug="current_landuse_group"
allow_verify={props.user !== undefined && props.building.current_landuse_group !== null && !props.edited}
onVerify={props.onVerify}
user_verified={props.user_verified.hasOwnProperty("current_landuse_group")}
user_verified_as={props.user_verified.current_landuse_group && props.user_verified.current_landuse_group.join(", ")}
verified_count={props.building.verified.current_landuse_group}
/>
{
props.mode != 'view' &&
<InfoBox msg="Land use order, shown below, is automatically derived from the land use groups"></InfoBox>
}
<DataEntry
title={dataFields.current_landuse_order.title}
tooltip={dataFields.current_landuse_order.tooltip}
slug="current_landuse_order"
value={props.building.current_landuse_order}
mode={props.mode}
disabled={true}
copy={props.copy}
onChange={props.onChange}
/>
<SelectDataEntry
title={dataFields.current_landuse_source.title}
slug="current_landuse_source"
value={props.building.current_landuse_source}
mode={props.mode}
copy={props.copy}
onChange={props.onChange}
tooltip={dataFields.current_landuse_source.tooltip}
placeholder=""
options={dataFields.current_landuse_source.items}
/>
</Fragment>
);
};
return (
<Fragment>
<InfoBox msg="93% of properties in UK are dwellings so we have set this as the default colour. Can you help us colour-in all non-residential and mixed use buildings, and verify residential buildings too?"></InfoBox>
<MultiDataEntry
title={dataFields.current_landuse_group.title}
slug="current_landuse_group"
value={props.building.current_landuse_group}
mode={props.mode}
copy={props.copy}
onChange={props.onChange}
confirmOnEnter={true}
tooltip={dataFields.current_landuse_group.tooltip}
placeholder="Type new land use group here"
copyable={true}
autofill={true}
showAllOptionsOnEmpty={true}
/> />
{ <Verification
props.mode != 'view' && slug="current_landuse_group"
<InfoBox msg="Land use order, shown below, is automatically derived from the land use groups"></InfoBox> allow_verify={props.user !== undefined && props.building.current_landuse_group !== null && !props.edited}
} onVerify={props.onVerify}
<DataEntry user_verified={props.user_verified.hasOwnProperty("current_landuse_group")}
title={dataFields.current_landuse_order.title} user_verified_as={props.user_verified.current_landuse_group && props.user_verified.current_landuse_group.join(", ")}
tooltip={dataFields.current_landuse_order.tooltip} verified_count={props.building.verified.current_landuse_group}
slug="current_landuse_order" />
value={props.building.current_landuse_order} {
mode={props.mode} props.mode != 'view' &&
disabled={true} <InfoBox msg="Land use order, shown below, is automatically derived from the land use groups"></InfoBox>
copy={props.copy} }
onChange={props.onChange} <DataEntry
/> title={dataFields.current_landuse_order.title}
<SelectDataEntry tooltip={dataFields.current_landuse_order.tooltip}
title={dataFields.current_landuse_source.title} slug="current_landuse_order"
slug="current_landuse_source" value={props.building.current_landuse_order}
value={props.building.current_landuse_source} mode={props.mode}
mode={props.mode} disabled={true}
copy={props.copy} copy={props.copy}
onChange={props.onChange} onChange={props.onChange}
tooltip={dataFields.current_landuse_source.tooltip}
placeholder=""
options={[
"Expert/personal knowledge of building",
"Online streetview image",
"Open planning authority dataset",
"Open property tax dataset",
"Open housing dataset",
"Open address dataset",
"Other"
]}
/> />
<MultiDataEntry <SelectDataEntry
title={dataFields.current_landuse_link.title} title={dataFields.current_landuse_source.title}
slug="current_landuse_link" slug="current_landuse_source"
value={props.building.current_landuse_link} value={props.building.current_landuse_source}
mode={props.mode} mode={props.mode}
copy={props.copy} copy={props.copy}
onChange={props.onChange} onChange={props.onChange}
tooltip={dataFields.current_landuse_link.tooltip} tooltip={dataFields.current_landuse_source.tooltip}
placeholder="https://..." placeholder=""
editableEntries={true} options={dataFields.current_landuse_source.items}
/> />
</Fragment> <MultiDataEntry
); title={dataFields.current_landuse_link.title}
slug="current_landuse_link"
value={props.building.current_landuse_link}
mode={props.mode}
copy={props.copy}
onChange={props.onChange}
tooltip={dataFields.current_landuse_link.tooltip}
placeholder="https://..."
editableEntries={true}
/>
</Fragment>
);
};
const UseContainer = withCopyEdit(UseView); const UseContainer = withCopyEdit(UseView);
export default UseContainer; export default UseContainer;

9
app/src/frontend/config/data-fields-config.ts
View File

@ -198,6 +198,15 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
title: "Source of information", title: "Source of information",
tooltip: "Source for the current land use", tooltip: "Source for the current land use",
example: "", example: "",
items: [
"Expert/personal knowledge of building",
"Online streetview image",
"Open planning authority dataset",
"Open property tax dataset",
"Open housing dataset",
"Open address dataset",
"Other"
],
}, },
current_landuse_source_detail: { current_landuse_source_detail: {
category: Category.LandUse, category: Category.LandUse,