Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Architectural Style -> Historical Period #1453

Merged
merged 2 commits into from
Dec 5, 2024
Merged

Architectural Style -> Historical Period #1453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4c087c
Architectural Style -> Historical Period
matkoniecz Dec 4, 2024
037015f
Drop unneded tooltip.
matkoniecz Dec 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions app/src/frontend/building/data-containers/age-history.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ const AgeHistoryView: React.FunctionComponent<CategoryViewProps> = (props) => {
}
}

const switchToStylePeriodMapStyle = (e) => {
const switchToHistoricalPeriodMapStyle = (e) => {
e.preventDefault();
props.onMapColourScale('typology_style_period')
}
Expand Down Expand Up @@ -93,10 +93,10 @@ const AgeHistoryView: React.FunctionComponent<CategoryViewProps> = (props) => {

return (
<Fragment>
<DataEntryGroup name="Architectural Style/Historical Period" collapsed={subcat==null || subcat!="2"}>
<DataEntryGroup name="Historical Period" collapsed={subcat==null || subcat!="2"}>
{(props.mapColourScale != "typology_style_period") ?
<button className={`map-switcher-inline enabled-state btn btn-outline btn-outline-dark key-button`} onClick={switchToStylePeriodMapStyle}>
Click to show architectural style.
<button className={`map-switcher-inline enabled-state btn btn-outline btn-outline-dark key-button`} onClick={switchToHistoricalPeriodMapStyle}>
Click to show historical period.
</button>
:
<></>
Expand Down
4 changes: 2 additions & 2 deletions app/src/frontend/building/data-containers/typology-size.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ const TypologySizeView: React.FunctionComponent<CategoryViewProps> = (props) =>
</>
}
</DataEntryGroup>
<DataEntryGroup name="Architectural Style" collapsed={subcat==null || subcat!="2"}>
<DataEntryGroup name="Historical Period" collapsed={subcat==null || subcat!="2"}>
<SelectDataEntry
title={dataFields.typology_style_period.title}
slug="typology_style_period"
Expand All @@ -123,7 +123,7 @@ const TypologySizeView: React.FunctionComponent<CategoryViewProps> = (props) =>
disabled={true}
/>
<div className={`alert alert-dark`} role="alert" style={{ fontSize: 14, backgroundColor: "#f6f8f9" }}>
<i className="source-url">To edit the architectural style box, and to see the data mapped, please go to&nbsp;
<i className="source-url">To edit the historical period box, and to see the data mapped, please go to&nbsp;
<a href={"/"+props.mode+"/age/"+props.building.building_id+"?sc=2"}>Age & History</a>.</i>
</div>
</DataEntryGroup>
Expand Down
2 changes: 1 addition & 1 deletion app/src/frontend/config/category-maps-config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export const categoryMapsConfig: {[key in Category]: CategoryMapDefinition[]} =
{
mapStyle: 'typology_style_period',
legend: {
title: 'Architectural style',
title: 'Historical Period',
elements: [
{ color: '#fae269', text: '2000-2025 (Early C21)' },
{ color: '#fbaf27', text: '1980-1999 (Late C20)' },
Expand Down
4 changes: 2 additions & 2 deletions app/src/frontend/config/data-fields-config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2233,8 +2233,8 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
},
typology_style_period: {
category: Category.TypologySize,
title: "Which description best suits the building's architectural style/historical period?",
tooltip: "Which description best suits the building's architectural style/historical period?",
title: "Which description best suits the building's historical period?",
tooltip: null,
example: "Georgian (1714-1837)",
items: [
'43AD-410 (Roman)',
Expand Down
Loading