diff --git a/app/src/api/config/dataFields.ts b/app/src/api/config/dataFields.ts index 4349fe86..e23c88b5 100644 --- a/app/src/api/config/dataFields.ts +++ b/app/src/api/config/dataFields.ts @@ -490,6 +490,10 @@ export const buildingAttributesConfig = valueType()({ /* eslint edit: true, verify: true }, + developer_links: { + edit: true, + verify: true + }, developer_source_type: { edit: true, verify: true @@ -502,6 +506,10 @@ export const buildingAttributesConfig = valueType()({ /* eslint edit: true, verify: true }, + landowner_links: { + edit: true, + verify: true + }, landowner_source_type: { edit: true, verify: true @@ -514,6 +522,10 @@ export const buildingAttributesConfig = valueType()({ /* eslint edit: true, verify: true }, + designers_links: { + edit: true, + verify: true + }, designers_source_type: { edit: true, verify: true @@ -538,6 +550,10 @@ export const buildingAttributesConfig = valueType()({ /* eslint edit: true, verify: true }, + builder_links: { + edit: true, + verify: true + }, builder_source_type: { edit: true, verify: true diff --git a/app/src/frontend/building/data-containers/team.tsx b/app/src/frontend/building/data-containers/team.tsx index cf9773ef..5db04212 100644 --- a/app/src/frontend/building/data-containers/team.tsx +++ b/app/src/frontend/building/data-containers/team.tsx @@ -4,9 +4,9 @@ import { commonSourceTypes, dataFields } from '../../config/data-fields-config'; import SelectDataEntry from '../data-components/select-data-entry'; 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, LogicalDataEntryYesOnly } from '../data-components/logical-data-entry/logical-data-entry'; import { DataEntryGroup } from '../data-components/data-entry-group'; +import { MultiDataEntry } from '../data-components/multi-data-entry/multi-data-entry'; import withCopyEdit from '../data-container'; @@ -156,6 +156,18 @@ const TeamView: React.FunctionComponent = (props) => { user_verified_as={props.user_verified.landowner} verified_count={props.building.verified.landowner} /> + = (props) => { user_verified_as={props.user_verified.developer_name} verified_count={props.building.verified.developer_name} /> + = (props) => { user_verified_as={props.user_verified.designers} verified_count={props.building.verified.designers} /> + = (props) => { user_verified_as={props.user_verified.builder} verified_count={props.building.verified.builder} /> +
Free-text entry disabled for security reasons.

For info on current land ownership, see 'Planning Controls'.", example: ["", "", ""], }, + landowner_links: { + category: Category.Team, + title: "Landowner link(s)", + tooltip: "A link to a webpage explaining who the land owner was when the building was built.", + example: ["", "", ""], + }, landowner_source_type: { category: Category.Team, title: "Source type", @@ -991,6 +1003,12 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */ tooltip: "First name, space, then Last name.

Free-text entry disabled for security reasons.", example: ["", "", ""], }, + designers_links: { + category: Category.Team, + title: "Designer link(s)", + tooltip: "A link to webpage(s) explaining who the designer of the building was.", + example: ["", "", ""], + }, designers_source_type: { category: Category.Team, title: "Source type", @@ -1034,6 +1052,12 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */ title: "Name of builder/construction team.

Free-text entry disabled for security reasons.", example: ["", "", ""], }, + builder_links: { + category: Category.Team, + title: "Builder link(s)", + tooltip: "A link to webpage(s) explaining who built the building was.", + example: ["", "", ""], + }, builder_source_type: { category: Category.Team, title: "Source type", diff --git a/migrations/041.ui_revamp_tweaks.down.sql b/migrations/041.ui_revamp_tweaks.down.sql index 34132357..9b732961 100644 --- a/migrations/041.ui_revamp_tweaks.down.sql +++ b/migrations/041.ui_revamp_tweaks.down.sql @@ -1,4 +1,8 @@ ALTER TABLE buildings DROP COLUMN IF EXISTS location_name_link; ALTER TABLE buildings DROP COLUMN IF EXISTS location_alternative_footprint_links; ALTER TABLE buildings DROP COLUMN IF EXISTS age_historical_raster_map_links; -ALTER TABLE buildings DROP COLUMN IF EXISTS age_historical_vectorised_footprint_links; \ No newline at end of file +ALTER TABLE buildings DROP COLUMN IF EXISTS age_historical_vectorised_footprint_links; +ALTER TABLE buildings DROP COLUMN IF EXISTS landowner_links; +ALTER TABLE buildings DROP COLUMN IF EXISTS designers_links; +ALTER TABLE buildings DROP COLUMN IF EXISTS builder_links; +ALTER TABLE buildings DROP COLUMN IF EXISTS developer_links; \ No newline at end of file diff --git a/migrations/041.ui_revamp_tweaks.up.sql b/migrations/041.ui_revamp_tweaks.up.sql index 549dee4b..3cd18818 100644 --- a/migrations/041.ui_revamp_tweaks.up.sql +++ b/migrations/041.ui_revamp_tweaks.up.sql @@ -1,4 +1,8 @@ ALTER TABLE buildings ADD COLUMN IF NOT EXISTS location_name_link text; ALTER TABLE buildings ADD COLUMN IF NOT EXISTS location_alternative_footprint_links text[]; ALTER TABLE buildings ADD COLUMN IF NOT EXISTS age_historical_raster_map_links text[]; -ALTER TABLE buildings ADD COLUMN IF NOT EXISTS age_historical_vectorised_footprint_links text[]; \ No newline at end of file +ALTER TABLE buildings ADD COLUMN IF NOT EXISTS age_historical_vectorised_footprint_links text[]; +ALTER TABLE buildings ADD COLUMN IF NOT EXISTS landowner_links text[]; +ALTER TABLE buildings ADD COLUMN IF NOT EXISTS designers_links text[]; +ALTER TABLE buildings ADD COLUMN IF NOT EXISTS builder_links text[]; +ALTER TABLE buildings ADD COLUMN IF NOT EXISTS developer_links text[]; \ No newline at end of file