Merge Local and Incoming Changes
This commit is contained in:
parent
8f9590adb6
commit
2f60ec72ae
@ -23,10 +23,10 @@ const ResilienceView: React.FunctionComponent<CategoryViewProps> = (props) => {
|
|||||||
const [ endDate, setEndDate ] = useState(null);
|
const [ endDate, setEndDate ] = useState(null);
|
||||||
|
|
||||||
return (<>
|
return (<>
|
||||||
<DataEntryGroup name="Disaster Management" collapsed={true} >
|
<DataEntryGroup name="Building Damage Assessment Tool" collapsed={true} >
|
||||||
<InfoBox>
|
<InfoBox>
|
||||||
This feature is designed to help communities capture data on the state of buildings
|
This feature is designed as an assessment tool to help communities capture data on the state of buildings following major disasters.
|
||||||
during major disasters, to support emergency services and to record damage to aid reconstruction programmes.
|
It is intended to help support emergency services, to record damage, and to aid reconstruction programmes.
|
||||||
</InfoBox>
|
</InfoBox>
|
||||||
<button className={`map-switcher-inline ${historicData}-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={historicDataSwitchOnClick}>
|
<button className={`map-switcher-inline ${historicData}-state btn btn-outline btn-outline-dark ${darkLightTheme}`} onClick={historicDataSwitchOnClick}>
|
||||||
{(historicData === 'enabled')?'Click here to hide disaster maps':'Click here to show disaster maps'}
|
{(historicData === 'enabled')?'Click here to hide disaster maps':'Click here to show disaster maps'}
|
||||||
@ -140,7 +140,7 @@ const ResilienceView: React.FunctionComponent<CategoryViewProps> = (props) => {
|
|||||||
isUrl={true}
|
isUrl={true}
|
||||||
/>
|
/>
|
||||||
</DataEntryGroup>
|
</DataEntryGroup>
|
||||||
<DataEntryGroup name="Resilience indicators" collapsed={true} >
|
<DataEntryGroup name="Resilience indicators and risk assessment" collapsed={true} >
|
||||||
<InfoBox>
|
<InfoBox>
|
||||||
This section is under development.
|
This section is under development.
|
||||||
</InfoBox>
|
</InfoBox>
|
||||||
|
@ -828,7 +828,7 @@ export const dataFields = { /* eslint-disable @typescript-eslint/camelcase */
|
|||||||
},
|
},
|
||||||
disaster_source_link: {
|
disaster_source_link: {
|
||||||
category: Category.Resilience,
|
category: Category.Resilience,
|
||||||
title: "Please add a source link to official documentation where applicable",
|
title: "Please add a source link to official documentation/photographic evidence where applicable",
|
||||||
tooltip: "URL for data sources(s)",
|
tooltip: "URL for data sources(s)",
|
||||||
example: ["", "", ""],
|
example: ["", "", ""],
|
||||||
},
|
},
|
||||||
|
Loading…
Reference in New Issue
Block a user