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

allow mixed answer for domestic use

Browse Source
This commit is contained in:
Mateusz Konieczny 2023-02-07 09:57:54 +01:00
parent 621a5b67db
commit e3e9e83632
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,10 +43,11 @@ const CommunityView: React.FunctionComponent<CategoryViewProps> = (props) => {
<InfoBox> <InfoBox>
Can you share your opinion on how well the building works? Can you share your opinion on how well the building works?
</InfoBox> </InfoBox>
<LogicalDataEntry <SelectDataEntry
title={dataFields.is_domestic.title} title={dataFields.is_domestic.title}
slug="is_domestic" slug="is_domestic"
value={props.building.is_domestic} value={props.building.is_domestic}
options={["yes", "no", "mixed"]}
mode={props.mode} mode={props.mode}
copy={props.copy} copy={props.copy}
onChange={props.onChange} onChange={props.onChange}
@ -60,7 +61,7 @@ const CommunityView: React.FunctionComponent<CategoryViewProps> = (props) => {
user_verified_as={props.user_verified.is_domestic} user_verified_as={props.user_verified.is_domestic}
verified_count={props.building.verified.is_domestic} verified_count={props.building.verified.is_domestic}
/> />
{props.building.is_domestic === false ? {(props.building.is_domestic === "no" || props.building.is_domestic === "mixed") ?
<UserOpinionEntry <UserOpinionEntry
slug='community_like' slug='community_like'
title={buildingUserFields.community_like.title} title={buildingUserFields.community_like.title}

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

@ -22,10 +22,11 @@ const UseView: React.FunctionComponent<CategoryViewProps> = (props) => {
){ ){
return ( return (
<Fragment> <Fragment>
<LogicalDataEntry <SelectDataEntry
title={dataFields.is_domestic.title} title={dataFields.is_domestic.title}
slug="is_domestic" slug="is_domestic"
value={props.building.is_domestic} value={props.building.is_domestic}
options={["yes", "no", "mixed"]}
mode={props.mode} mode={props.mode}
copy={props.copy} copy={props.copy}
onChange={props.onChange} onChange={props.onChange}

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

@ -575,7 +575,7 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
category: Category.Team, category: Category.Team,
title: "Is the building a home/domestic building?", title: "Is the building a home/domestic building?",
tooltip: "", tooltip: "",
example: false example: "mixed"
}, },
likes_total: { likes_total: {
category: Category.Community, category: Category.Community,

2
app/src/tiles/dataDefinition.ts
View File

@ -116,7 +116,7 @@ const LAYER_QUERIES = {
FROM FROM
buildings buildings
WHERE WHERE
is_domestic = FALSE is_domestic <> 'yes'
AND AND
likes_total > 0`, likes_total > 0`,
community_local_significance_total: ` community_local_significance_total: `

2
migrations/037.is_domestic.up.sql
View File

@ -1 +1 @@
ALTER TABLE buildings ADD COLUMN IF NOT EXISTS is_domestic boolean null; ALTER TABLE buildings ADD COLUMN IF NOT EXISTS is_domestic text null;