From 50cecf36bbbad7489efa99d9fad1be69df23331f Mon Sep 17 00:00:00 2001
From: Mateusz Konieczny <matkoniecz@gmail.com>
Date: Thu, 29 Sep 2022 14:40:06 +0200
Subject: [PATCH] add conservation area id

---
 app/src/api/config/dataFields.ts              | 16 ++++++++++++++++
 .../building/data-containers/planning.tsx     | 19 ++++++++++++++-----
 app/src/frontend/config/data-fields-config.ts |  6 ++++++
 ...3.redesign_protection_designation.down.sql |  3 ++-
 ...033.redesign_protection_designation.up.sql |  2 ++
 5 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/app/src/api/config/dataFields.ts b/app/src/api/config/dataFields.ts
index 553a736d..beb71f96 100644
--- a/app/src/api/config/dataFields.ts
+++ b/app/src/api/config/dataFields.ts
@@ -169,6 +169,22 @@ export const buildingAttributesConfig = valueType<DataFieldConfig>()({ /* eslint
         edit: true,
         verify: true,
     },
+    work_on_site_is_completed: {
+        edit: true,
+        verify: true,
+    },
+    work_on_site_is_completed_on_year: {
+        edit: true,
+        verify: true,
+    },
+    planning_planning_application_id_crowdsourced: {
+        edit: true,
+        verify: true,
+    },
+    planning_in_conservation_area_id: {
+        edit: true,
+        verify: true,
+    },
     planning_in_conservation_area_url: {
         edit: true,
         verify: true,
diff --git a/app/src/frontend/building/data-containers/planning.tsx b/app/src/frontend/building/data-containers/planning.tsx
index 76005b22..0cf61360 100644
--- a/app/src/frontend/building/data-containers/planning.tsx
+++ b/app/src/frontend/building/data-containers/planning.tsx
@@ -91,14 +91,13 @@ const PlanningView: React.FunctionComponent<CategoryViewProps> = (props) => (
         <DataEntryGroup name="Designation/protection" collapsed={false} >
             <DataEntryGroup name="Conservation" collapsed={false} >
                 <DataEntry
-                    title={dataFields.planning_in_conservation_area_url.title}
-                    slug="planning_in_conservation_area_url"
-                    value={props.building.planning_in_conservation_area_url}
+                    title={dataFields.planning_in_conservation_area_id.title}
+                    slug="planning_in_conservation_area_id"
+                    value={props.building.planning_in_conservation_area_id}
                     mode={props.mode}
                     copy={props.copy}
                     onChange={props.onChange}
-                    isUrl={true}
-                    placeholder="Please add relevant link here"
+                    placeholder="Please add Conservation Area identifier"
                     />
                 <Verification
                     slug="planning_in_conservation_area_url"
@@ -108,6 +107,16 @@ const PlanningView: React.FunctionComponent<CategoryViewProps> = (props) => (
                     user_verified_as={props.user_verified.planning_in_conservation_area_url}
                     verified_count={props.building.verified.planning_in_conservation_area_url}
                     />
+                <DataEntry
+                    title={dataFields.planning_in_conservation_area_url.title}
+                    slug="planning_in_conservation_area_url"
+                    value={props.building.planning_in_conservation_area_url}
+                    mode={props.mode}
+                    copy={props.copy}
+                    onChange={props.onChange}
+                    isUrl={true}
+                    placeholder="Please add CA appraisal link here"
+                    />
                 <DataEntry
                     title={dataFields.planning_conservation_area_name.title}
                     slug="planning_conservation_area_name"
diff --git a/app/src/frontend/config/data-fields-config.ts b/app/src/frontend/config/data-fields-config.ts
index 629c7033..c29267bf 100644
--- a/app/src/frontend/config/data-fields-config.ts
+++ b/app/src/frontend/config/data-fields-config.ts
@@ -452,6 +452,12 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
         example: "",
         //tooltip: ,
     },
+    planning_in_conservation_area_id: {
+        category: Category.Planning,
+        title: "Conservation Area identifier",
+        example: "",
+        //tooltip: ,
+    },
     planning_conservation_area_name: {
         category: Category.Planning,
         title: "Conservation Area Name",
diff --git a/migrations/033.redesign_protection_designation.down.sql b/migrations/033.redesign_protection_designation.down.sql
index 2dd1f1a4..394d0380 100644
--- a/migrations/033.redesign_protection_designation.down.sql
+++ b/migrations/033.redesign_protection_designation.down.sql
@@ -8,8 +8,9 @@ ALTER TABLE buildings ADD COLUMN IF NOT EXISTS planning_in_apa boolean DEFAULT F
 ALTER TABLE buildings DROP COLUMN IF EXISTS planning_heritage_at_risk_url;
 ALTER TABLE buildings ADD COLUMN IF NOT EXISTS planning_heritage_at_risk_id int DEFAULT NULL;
 
-ALTER TABLE buildings DROP COLUMN IF EXISTS planning_in_conservation_area_url;
+ALTER TABLE buildings DROP COLUMN IF EXISTS planning_in_conservation_area_id;
 ALTER TABLE buildings ADD COLUMN IF NOT EXISTS planning_in_conservation_area boolean DEFAULT FALSE;
+ALTER TABLE buildings DROP COLUMN IF EXISTS planning_in_conservation_area_url;
 
 ALTER TABLE buildings ADD COLUMN IF NOT EXISTS planning_in_glher boolean DEFAULT FALSE;
 ALTER TABLE buildings ADD COLUMN IF NOT EXISTS planning_apa_name VARCHAR DEFAULT '';
diff --git a/migrations/033.redesign_protection_designation.up.sql b/migrations/033.redesign_protection_designation.up.sql
index f1e8c353..b3694ddb 100644
--- a/migrations/033.redesign_protection_designation.up.sql
+++ b/migrations/033.redesign_protection_designation.up.sql
@@ -16,6 +16,8 @@ ALTER TABLE buildings ADD COLUMN IF NOT EXISTS planning_in_apa_url VARCHAR DEFAU
 ALTER TABLE buildings DROP COLUMN IF EXISTS planning_heritage_at_risk_id;
 ALTER TABLE buildings ADD COLUMN IF NOT EXISTS planning_heritage_at_risk_url VARCHAR DEFAULT '';
 
+
+ALTER TABLE buildings ADD COLUMN IF NOT EXISTS planning_in_conservation_area_id VARCHAR DEFAULT '';
 ALTER TABLE buildings DROP COLUMN IF EXISTS planning_in_conservation_area;
 ALTER TABLE buildings ADD COLUMN IF NOT EXISTS planning_in_conservation_area_url VARCHAR DEFAULT '';