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

remove 'is domestic' question form community and hide liking individual buildings

Browse Source
This commit is contained in:
Mateusz Konieczny 2023-02-08 10:35:01 +01:00
parent aab44869f8
commit c74d358c33
3 changed files with 9 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/src/frontend/building/data-containers/community.tsx
View File

@ -20,10 +20,6 @@ import { useDisplayPreferences } from '../../displayPreferences-context';
* Community view/edit section
*/
const CommunityView: React.FunctionComponent<CategoryViewProps> = (props) => {
const switchToIsDomesticMapStyle = (e) => {
e.preventDefault();
props.onMapColourScale('is_domestic')
}
const switchToLikesMapStyle = (e) => {
e.preventDefault();
props.onMapColourScale('likes')
@ -51,28 +47,8 @@ const CommunityView: React.FunctionComponent<CategoryViewProps> = (props) => {
<InfoBox>
Can you share your opinion on how well the building works?
</InfoBox>
<SelectDataEntry
title={dataFields.is_domestic.title}
slug="is_domestic"
value={props.building.is_domestic}
options={["yes", "no", "mixed domestic/non-domestic"]}
mode={props.mode}
copy={props.copy}
onChange={props.onChange}
tooltip={dataFields.is_domestic.tooltip}
/>
<Verification
slug="is_domestic"
allow_verify={props.user !== undefined && props.building.is_domestic !== null && !props.edited}
onVerify={props.onVerify}
user_verified={props.user_verified.hasOwnProperty("is_domestic")}
user_verified_as={props.user_verified.is_domestic}
verified_count={props.building.verified.is_domestic}
/>
Work from home does not count as office and does not make building non-domestic.
<button className={`map-switcher-inline ${props.mapColourScale == "is_domestic" ? "enabled-state" : "disabled-state"} btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={switchToIsDomesticMapStyle}>
{(props.mapColourScale == "is_domestic")? 'Showing domestic status for specific buildings' : 'Click to see domestic status for specific buildings mapped'}
</button>
{
/*
{(props.building.is_domestic === "no" || props.building.is_domestic === "mixed domestic/non-domestic") ?
<>
<UserOpinionEntry
@ -90,6 +66,8 @@ const CommunityView: React.FunctionComponent<CategoryViewProps> = (props) => {
</button>
</>
: <></>}
*/
}
<LogicalDataEntryYesOnly
slug='community_type_worth_keeping'
title={buildingUserFields.community_type_worth_keeping.title}

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

@ -47,6 +47,9 @@ const UseView: React.FunctionComponent<CategoryViewProps> = (props) => {
verified_count={props.building.verified.is_domestic}
/>
Work from home does not count as office and does not make building non-domestic.
<button className={`map-switcher-inline ${props.mapColourScale == "is_domestic" ? "enabled-state" : "disabled-state"} btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={switchToIsDomesticMapStyle}>
{(props.mapColourScale == "is_domestic")? 'Showing domestic status for specific buildings' : 'Click to see domestic status for specific buildings mapped'}
</button>
<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}

13
app/src/frontend/config/category-maps-config.ts
View File

@ -108,17 +108,7 @@ export const categoryMapsConfig: {[key in Category]: CategoryMapDefinition[]} =
},
}],
[Category.Community]: [
{
mapStyle: 'is_domestic',
legend: {
title: 'Is domestic building?',
elements: [
{ color: '#f7ec25', text: 'Domestic' },
{ color: '#fc9b2a', text: 'Mixed' },
{ color: '#ff2121', text: 'Non-domestic' },
]
}
},
/*
{
mapStyle: 'likes',
legend: {
@ -134,6 +124,7 @@ export const categoryMapsConfig: {[key in Category]: CategoryMapDefinition[]} =
]
}
},
*/
{
mapStyle: 'typology_likes',
legend: {