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

refactor date verification buttons

Browse Source
This commit is contained in:
Ed Chalstrey 2022-05-19 10:48:53 +01:00
parent 66c08a0da2
commit 3b5ca75eef
2 changed files with 16 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/frontend/building/data-components/year-data-entry.tsx
View File

@ -73,6 +73,14 @@ class YearDataEntry extends Component<YearDataEntryProps, any> {
max={currentYear} max={currentYear}
tooltip={dataFields.date_lower.tooltip} tooltip={dataFields.date_lower.tooltip}
/> />
<Verification
slug="date_lower"
allow_verify={props.user !== undefined && props.building.date_lower !== null && !props.edited}
onVerify={props.onVerify}
user_verified={props.user_verified.hasOwnProperty("date_lower")}
user_verified_as={props.user_verified.date_lower}
verified_count={props.building.verified.date_lower}
/>
<NumericDataEntry <NumericDataEntry
title={dataFields.date_upper.title} title={dataFields.date_upper.title}
@ -85,6 +93,14 @@ class YearDataEntry extends Component<YearDataEntryProps, any> {
min={1} min={1}
max={currentYear} max={currentYear}
tooltip={dataFields.date_upper.tooltip} tooltip={dataFields.date_upper.tooltip}
/>
<Verification
slug="date_upper"
allow_verify={props.user !== undefined && props.building.date_upper !== null && !props.edited}
onVerify={props.onVerify}
user_verified={props.user_verified.hasOwnProperty("date_upper")}
user_verified_as={props.user_verified.date_upper}
verified_count={props.building.verified.date_upper}
/> />
</Fragment> </Fragment>
); );

32
app/src/frontend/building/data-containers/age.tsx
View File

@ -36,22 +36,6 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
user_verified_as={props.user_verified.date_year} user_verified_as={props.user_verified.date_year}
verified_count={props.building.verified.date_year} verified_count={props.building.verified.date_year}
/> />
<Verification
slug="date_upper"
allow_verify={props.user !== undefined && props.building.date_upper !== null && !props.edited}
onVerify={props.onVerify}
user_verified={props.user_verified.hasOwnProperty("date_upper")}
user_verified_as={props.user_verified.date_upper}
verified_count={props.building.verified.date_upper}
/>
<Verification
slug="date_lower"
allow_verify={props.user !== undefined && props.building.date_lower !== null && !props.edited}
onVerify={props.onVerify}
user_verified={props.user_verified.hasOwnProperty("date_lower")}
user_verified_as={props.user_verified.date_lower}
verified_count={props.building.verified.date_lower}
/>
<NumericDataEntry <NumericDataEntry
title={dataFields.facade_year.title} title={dataFields.facade_year.title}
slug="facade_year" slug="facade_year"
@ -111,22 +95,6 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
user_verified_as={props.user_verified.date_year} user_verified_as={props.user_verified.date_year}
verified_count={props.building.verified.date_year} verified_count={props.building.verified.date_year}
/> />
<Verification
slug="date_upper"
allow_verify={props.user !== undefined && props.building.date_upper !== null && !props.edited}
onVerify={props.onVerify}
user_verified={props.user_verified.hasOwnProperty("date_upper")}
user_verified_as={props.user_verified.date_upper}
verified_count={props.building.verified.date_upper}
/>
<Verification
slug="date_lower"
allow_verify={props.user !== undefined && props.building.date_lower !== null && !props.edited}
onVerify={props.onVerify}
user_verified={props.user_verified.hasOwnProperty("date_lower")}
user_verified_as={props.user_verified.date_lower}
verified_count={props.building.verified.date_lower}
/>
<NumericDataEntry <NumericDataEntry
title={dataFields.facade_year.title} title={dataFields.facade_year.title}
slug="facade_year" slug="facade_year"