Merge remote-tracking branch 'upstream/master' into feature/display-of-planning-data
This commit is contained in:
commit
d4ec4653b8
@ -268,84 +268,110 @@ const PlanningView: React.FunctionComponent<CategoryViewProps> = (props) => {
|
|||||||
verified_count={props.building.verified.planning_in_apa_url}
|
verified_count={props.building.verified.planning_in_apa_url}
|
||||||
/>
|
/>
|
||||||
</DataEntryGroup>
|
</DataEntryGroup>
|
||||||
<DataEntryGroup name="Other types of zoning" collapsed={false} >
|
</DataEntryGroup>
|
||||||
<CheckboxDataEntry
|
<DataEntryGroup name="Other types of zoning" collapsed={false} >
|
||||||
title="Is the building inside a flood zone?"
|
<CheckboxDataEntry
|
||||||
slug="planning_live_application"
|
title="Is the building inside a flood zone?"
|
||||||
value={null}
|
slug="planning_live_application"
|
||||||
disabled={true}
|
value={null}
|
||||||
|
disabled={true}
|
||||||
|
/>
|
||||||
|
<Verification
|
||||||
|
slug="dummy"
|
||||||
|
allow_verify={false}
|
||||||
|
onVerify={props.onVerify}
|
||||||
|
user_verified={props.user_verified.hasOwnProperty("dummy")}
|
||||||
|
user_verified_as={props.user_verified.planning_in_apa_url}
|
||||||
|
verified_count={props.building.verified.planning_in_apa_url}
|
||||||
|
/>
|
||||||
|
<CheckboxDataEntry
|
||||||
|
title="Is the building in a strategic development zone for housing?"
|
||||||
|
slug="planning_live_application"
|
||||||
|
value={null}
|
||||||
|
disabled={true}
|
||||||
|
/>
|
||||||
|
<Verification
|
||||||
|
slug="dummy"
|
||||||
|
allow_verify={false}
|
||||||
|
onVerify={props.onVerify}
|
||||||
|
user_verified={props.user_verified.hasOwnProperty("dummy")}
|
||||||
|
user_verified_as={props.user_verified.planning_in_apa_url}
|
||||||
|
verified_count={props.building.verified.planning_in_apa_url}
|
||||||
|
/>
|
||||||
|
<CheckboxDataEntry
|
||||||
|
title="Is the building in a strategic development zone for commerce or industry?"
|
||||||
|
slug="planning_live_application"
|
||||||
|
value={null}
|
||||||
|
disabled={true}
|
||||||
|
/>
|
||||||
|
<Verification
|
||||||
|
slug="dummy"
|
||||||
|
allow_verify={false}
|
||||||
|
onVerify={props.onVerify}
|
||||||
|
user_verified={props.user_verified.hasOwnProperty("dummy")}
|
||||||
|
user_verified_as={props.user_verified.planning_in_apa_url}
|
||||||
|
verified_count={props.building.verified.planning_in_apa_url}
|
||||||
|
/>
|
||||||
|
<CheckboxDataEntry
|
||||||
|
title="Is the building within a protected sightline?"
|
||||||
|
slug="planning_live_application"
|
||||||
|
value={null}
|
||||||
|
disabled={true}
|
||||||
|
/>
|
||||||
|
<Verification
|
||||||
|
slug="dummy"
|
||||||
|
allow_verify={false}
|
||||||
|
onVerify={props.onVerify}
|
||||||
|
user_verified={props.user_verified.hasOwnProperty("dummy")}
|
||||||
|
user_verified_as={props.user_verified.planning_in_apa_url}
|
||||||
|
verified_count={props.building.verified.planning_in_apa_url}
|
||||||
|
/>
|
||||||
|
{/*
|
||||||
|
<DataEntry
|
||||||
|
title={dataFields.planning_glher_url.title}
|
||||||
|
slug="planning_glher_url"
|
||||||
|
value={props.building.planning_glher_url}
|
||||||
|
mode={props.mode}
|
||||||
|
copy={props.copy}
|
||||||
|
onChange={props.onChange}
|
||||||
|
isUrl={true}
|
||||||
|
placeholder="Please add relevant link here"
|
||||||
/>
|
/>
|
||||||
<Verification
|
<Verification
|
||||||
slug="dummy"
|
slug="planning_glher_url"
|
||||||
allow_verify={false}
|
allow_verify={props.user !== undefined && props.building.planning_glher_url !== null && !props.edited}
|
||||||
onVerify={props.onVerify}
|
onVerify={props.onVerify}
|
||||||
user_verified={props.user_verified.hasOwnProperty("dummy")}
|
user_verified={props.user_verified.hasOwnProperty("planning_glher_url")}
|
||||||
user_verified_as={props.user_verified.planning_in_apa_url}
|
user_verified_as={props.user_verified.planning_glher_url}
|
||||||
verified_count={props.building.verified.planning_in_apa_url}
|
verified_count={props.building.verified.planning_glher_url}
|
||||||
/>
|
/>
|
||||||
<CheckboxDataEntry
|
*/}
|
||||||
title="Is the building in a strategic development zone for housing?"
|
</DataEntryGroup>
|
||||||
slug="planning_live_application"
|
<DataEntryGroup name="Land parcel ownership" collapsed={false} >
|
||||||
value={null}
|
<SelectDataEntry
|
||||||
disabled={true}
|
slug='community_public_ownership'
|
||||||
/>
|
title={"What type of owner owns this land parcel? "}
|
||||||
<Verification
|
value={props.building.community_public_ownership}
|
||||||
slug="dummy"
|
options={[
|
||||||
allow_verify={false}
|
'Government-owned',
|
||||||
onVerify={props.onVerify}
|
'Charity-owned',
|
||||||
user_verified={props.user_verified.hasOwnProperty("dummy")}
|
'Community-owned/cooperative',
|
||||||
user_verified_as={props.user_verified.planning_in_apa_url}
|
'Owned by other non-profit body',
|
||||||
verified_count={props.building.verified.planning_in_apa_url}
|
'Not in public/community ownership',
|
||||||
/>
|
]}
|
||||||
<CheckboxDataEntry
|
|
||||||
title="Is the building in a strategic development zone for commerce or industry?"
|
onChange={props.onChange}
|
||||||
slug="planning_live_application"
|
|
||||||
value={null}
|
|
||||||
disabled={true}
|
|
||||||
/>
|
|
||||||
<Verification
|
|
||||||
slug="dummy"
|
|
||||||
allow_verify={false}
|
|
||||||
onVerify={props.onVerify}
|
|
||||||
user_verified={props.user_verified.hasOwnProperty("dummy")}
|
|
||||||
user_verified_as={props.user_verified.planning_in_apa_url}
|
|
||||||
verified_count={props.building.verified.planning_in_apa_url}
|
|
||||||
/>
|
|
||||||
<CheckboxDataEntry
|
|
||||||
title="Is the building within a protected sightline?"
|
|
||||||
slug="planning_live_application"
|
|
||||||
value={null}
|
|
||||||
disabled={true}
|
|
||||||
/>
|
|
||||||
<Verification
|
|
||||||
slug="dummy"
|
|
||||||
allow_verify={false}
|
|
||||||
onVerify={props.onVerify}
|
|
||||||
user_verified={props.user_verified.hasOwnProperty("dummy")}
|
|
||||||
user_verified_as={props.user_verified.planning_in_apa_url}
|
|
||||||
verified_count={props.building.verified.planning_in_apa_url}
|
|
||||||
/>
|
|
||||||
{/*
|
|
||||||
<DataEntry
|
|
||||||
title={dataFields.planning_glher_url.title}
|
|
||||||
slug="planning_glher_url"
|
|
||||||
value={props.building.planning_glher_url}
|
|
||||||
mode={props.mode}
|
mode={props.mode}
|
||||||
copy={props.copy}
|
copy={props.copy}
|
||||||
onChange={props.onChange}
|
/>
|
||||||
isUrl={true}
|
|
||||||
placeholder="Please add relevant link here"
|
|
||||||
/>
|
|
||||||
<Verification
|
<Verification
|
||||||
slug="planning_glher_url"
|
slug="community_public_ownership"
|
||||||
allow_verify={props.user !== undefined && props.building.planning_glher_url !== null && !props.edited}
|
allow_verify={props.user !== undefined && props.building.community_public_ownership !== null && !props.edited}
|
||||||
onVerify={props.onVerify}
|
onVerify={props.onVerify}
|
||||||
user_verified={props.user_verified.hasOwnProperty("planning_glher_url")}
|
user_verified={props.user_verified.hasOwnProperty("community_public_ownership")}
|
||||||
user_verified_as={props.user_verified.planning_glher_url}
|
user_verified_as={props.user_verified.community_public_ownership}
|
||||||
verified_count={props.building.verified.planning_glher_url}
|
verified_count={props.building.verified.community_public_ownership}
|
||||||
/>
|
/>
|
||||||
*/}
|
|
||||||
</DataEntryGroup>
|
|
||||||
</DataEntryGroup>
|
</DataEntryGroup>
|
||||||
</Fragment>
|
</Fragment>
|
||||||
)};
|
)};
|
||||||
|
Loading…
Reference in New Issue
Block a user