From 3b5ca75eefe8175baf10e048b679f3565aeeb43b Mon Sep 17 00:00:00 2001
From: Ed Chalstrey <edwardchalstrey@gmail.com>
Date: Thu, 19 May 2022 10:48:53 +0100
Subject: [PATCH] refactor date verification buttons

---
 .../data-components/year-data-entry.tsx       | 16 ++++++++++
 .../frontend/building/data-containers/age.tsx | 32 -------------------
 2 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/app/src/frontend/building/data-components/year-data-entry.tsx b/app/src/frontend/building/data-components/year-data-entry.tsx
index 472a72d8..d3b7ac18 100644
--- a/app/src/frontend/building/data-components/year-data-entry.tsx
+++ b/app/src/frontend/building/data-components/year-data-entry.tsx
@@ -73,6 +73,14 @@ class YearDataEntry extends Component<YearDataEntryProps, any> {
                     max={currentYear}
                     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
                     title={dataFields.date_upper.title}
@@ -85,6 +93,14 @@ class YearDataEntry extends Component<YearDataEntryProps, any> {
                     min={1}
                     max={currentYear}
                     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>
         );
diff --git a/app/src/frontend/building/data-containers/age.tsx b/app/src/frontend/building/data-containers/age.tsx
index ce6ff6bd..d1916323 100644
--- a/app/src/frontend/building/data-containers/age.tsx
+++ b/app/src/frontend/building/data-containers/age.tsx
@@ -36,22 +36,6 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
                   user_verified_as={props.user_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
                   title={dataFields.facade_year.title}
                   slug="facade_year"
@@ -111,22 +95,6 @@ const AgeView: React.FunctionComponent<CategoryViewProps> = (props) => {
                 user_verified_as={props.user_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
                 title={dataFields.facade_year.title}
                 slug="facade_year"