From b59e811412a93e0325994cce2aee2435ee7faa0d Mon Sep 17 00:00:00 2001
From: Ed Chalstrey <edwardchalstrey@gmail.com>
Date: Mon, 6 Jun 2022 14:20:27 +0100
Subject: [PATCH] change to has_extension bool

---
 app/src/api/config/dataFields.ts                  |  2 +-
 .../frontend/building/data-containers/team.tsx    | 15 ++++++++-------
 app/src/frontend/config/data-fields-config.ts     | 10 +++-------
 migrations/029.team.up.sql                        |  1 +
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/app/src/api/config/dataFields.ts b/app/src/api/config/dataFields.ts
index f89b3d3e..d9816cfd 100644
--- a/app/src/api/config/dataFields.ts
+++ b/app/src/api/config/dataFields.ts
@@ -325,7 +325,7 @@ export const buildingAttributesConfig = valueType<DataFieldConfig>()({ /* eslint
     },
     is_extension: {
         edit: true,
-        verify: false
+        verify: true
     },
     extension_year: {
         edit: true,
diff --git a/app/src/frontend/building/data-containers/team.tsx b/app/src/frontend/building/data-containers/team.tsx
index 17b086c5..1d2b5984 100644
--- a/app/src/frontend/building/data-containers/team.tsx
+++ b/app/src/frontend/building/data-containers/team.tsx
@@ -6,6 +6,7 @@ import NumericDataEntry from '../data-components/numeric-data-entry';
 import Verification from '../data-components/verification';
 import { MultiDataEntry } from '../data-components/multi-data-entry/multi-data-entry';
 import { LogicalDataEntry } from '../data-components/logical-data-entry/logical-data-entry';
+import { DataEntryGroup } from '../data-components/data-entry-group';
 
 import withCopyEdit from '../data-container';
 
@@ -22,17 +23,17 @@ const TeamView: React.FunctionComponent<CategoryViewProps> = (props) => {
        <form>
           <InfoBox msg="Can you help us capture information on who built the current building?"></InfoBox>
           <SelectDataEntry
-              title={dataFields.is_extension.title}
-              slug="is_extension"
-              value={props.building.is_extension}
+              title={dataFields.has_extension.title}
+              slug="has_extension"
+              value={props.building.has_extension}
               mode={props.mode}
               copy={props.copy}
               onChange={props.onChange}
-              tooltip={dataFields.is_extension.tooltip}
-              placeholder={dataFields.is_extension.example}
-              options={dataFields.is_extension.items}
+              tooltip={dataFields.has_extension.tooltip}
+              placeholder={dataFields.has_extension.example}
+              options={dataFields.has_extension.items}
               />
-         {props.building.is_extension == "The main building" ? (
+         {props.building.has_extension == "The main building" ? (
           <>
           <NumericDataEntry
               slug='date_year'
diff --git a/app/src/frontend/config/data-fields-config.ts b/app/src/frontend/config/data-fields-config.ts
index e3b3c3ec..1d9695c5 100644
--- a/app/src/frontend/config/data-fields-config.ts
+++ b/app/src/frontend/config/data-fields-config.ts
@@ -637,15 +637,11 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
                 lifespan: "2-5", overlap_present: "50%", links: ["", ""]}
         ]
     },
-    is_extension: {
+    has_extension: {
         category: Category.Team,
-        title: "Do you wish to add information on:",
+        title: "Is there an extension?",
         tooltip: "",
-        example: "",
-        items: [
-            "The main building",
-            "A major extension"
-        ],
+        example: false
     },
     extension_year: {
         category: Category.Team,
diff --git a/migrations/029.team.up.sql b/migrations/029.team.up.sql
index b9dcf467..ce6ad363 100644
--- a/migrations/029.team.up.sql
+++ b/migrations/029.team.up.sql
@@ -1,3 +1,4 @@
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS has_extension smallint;
 ALTER TABLE buildings ADD COLUMN IF NOT EXISTS extension_year smallint;
 ALTER TABLE buildings ADD COLUMN IF NOT EXISTS developer_type varchar;
 ALTER TABLE buildings ADD COLUMN IF NOT EXISTS designers varchar;