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

prevent duplication in landuse code

Browse Source
This commit is contained in:
Mateusz Konieczny 2023-02-08 10:28:58 +01:00
parent 8f7eb6bf81
commit fec74c4a84
1 changed files with 8 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,10 +16,6 @@ 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) => {
if (props.building.current_landuse_source == "Expert/personal knowledge of building" ||
props.building.current_landuse_source == "Online streetview image" ||
props.building.current_landuse_source == null
){
return ( return (
<Fragment> <Fragment>
<SelectDataEntry <SelectDataEntry
@ -97,68 +93,10 @@ const UseView: React.FunctionComponent<CategoryViewProps> = (props) => {
user_verified_as={props.user_verified.current_landuse_source} user_verified_as={props.user_verified.current_landuse_source}
verified_count={props.building.verified.current_landuse_source} verified_count={props.building.verified.current_landuse_source}
/> />
</Fragment> {(props.building.current_landuse_source == "Expert/personal knowledge of building" ||
); props.building.current_landuse_source == "Online streetview image" ||
}; props.building.current_landuse_source == null) ? <></> :
return ( <><MultiDataEntry
<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
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={dataFields.current_landuse_source.example}
options={dataFields.current_landuse_source.items}
/>
<Verification
slug="current_landuse_source"
allow_verify={props.user !== undefined && props.building.current_landuse_source !== null && !props.edited}
onVerify={props.onVerify}
user_verified={props.user_verified.hasOwnProperty("current_landuse_source")}
user_verified_as={props.user_verified.current_landuse_source}
verified_count={props.building.verified.current_landuse_source}
/>
<MultiDataEntry
title={dataFields.current_landuse_link.title} title={dataFields.current_landuse_link.title}
slug="current_landuse_link" slug="current_landuse_link"
value={props.building.current_landuse_link} value={props.building.current_landuse_link}
@ -178,8 +116,10 @@ const UseView: React.FunctionComponent<CategoryViewProps> = (props) => {
user_verified_as={props.user_verified.current_landuse_link} user_verified_as={props.user_verified.current_landuse_link}
verified_count={props.building.verified.current_landuse_link} verified_count={props.building.verified.current_landuse_link}
/> />
</Fragment> </>
); }
</Fragment>
);
}; };
const UseContainer = withCopyEdit(UseView); const UseContainer = withCopyEdit(UseView);