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

feat: Update depth presets for Capri #1751

Merged
merged 3 commits into from
Jul 12, 2024
Merged

feat: Update depth presets for Capri #1751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
08ce6e6
feat: Rename NRCS to NRCS/GSP
knipec Jul 9, 2024
3d6720f
refactor: Rename BLM_STANDARD to BLM and bump client-shared to commit…
knipec Jul 11, 2024
db8dddf
fix: Update test snapshot for new default intervals
knipec Jul 11, 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
4 changes: 2 additions & 2 deletions dev-client/__tests__/integration/SlopeScreen-test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ test('renders correctly', () => {
status: 'ready',
soilData: {
'1': {
depthIntervalPreset: 'LANDPKS',
depthIntervalPreset: 'NRCS',
depthIntervals: [],
depthDependentData: [],
slopeSteepnessSelect: 'FLAT',
Expand All @@ -45,7 +45,7 @@ test('renders correctly', () => {
collectionMethods.map(method => [methodRequired(method), false]),
),
soilPitRequired: false,
depthIntervalPreset: 'LANDPKS',
depthIntervalPreset: 'NRCS',
depthIntervals: [],
slopeRequired: true,
},
Expand Down
10 changes: 5 additions & 5 deletions dev-client/__tests__/integration/__snapshots__/SoilScreen-test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ exports[`renders correctly 1`] = `
}
}
>
0–10cm
0–5cm
</Text>
</View>
<View
Expand Down Expand Up @@ -598,7 +598,7 @@ exports[`renders correctly 1`] = `
}
}
>
10–20cm
5–15cm
</Text>
</View>
<View
Expand Down Expand Up @@ -891,7 +891,7 @@ exports[`renders correctly 1`] = `
}
}
>
20–50cm
15–30cm
</Text>
</View>
<View
Expand Down Expand Up @@ -1184,7 +1184,7 @@ exports[`renders correctly 1`] = `
}
}
>
50–70cm
30–60cm
</Text>
</View>
<View
Expand Down Expand Up @@ -1477,7 +1477,7 @@ exports[`renders correctly 1`] = `
}
}
>
70–100cm
60–100cm
</Text>
</View>
<View
Expand Down
10 changes: 6 additions & 4 deletions dev-client/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dev-client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"react-native-screens": "^3.32.0",
"react-native-svg": "^15.3.0",
"react-native-tab-view": "^3.5.2",
"terraso-client-shared": "github:techmatters/terraso-client-shared#e1b4e4d",
"terraso-client-shared": "github:techmatters/terraso-client-shared#0fd354a7a42f2d0317f5add48b016e62acb29a5b",
"uuid": "^10.0.0",
"yup": "^1.4.0"
},
Expand Down
2 changes: 1 addition & 1 deletion dev-client/src/screens/SoilScreen/components/EditSiteSoilDepthPreset.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ export const EditSiteSoilDepthPreset = ({selected, updateChoice}: Props) => {
label={t('soil.soil_preset.label')}
labelProps={{variant: 'body1'}}
options={{
LANDPKS: {text: t('soil.soil_preset.LANDPKS')},
NRCS: {text: t('soil.soil_preset.NRCS')},
BLM: {text: t('soil.soil_preset.BLM')},
CUSTOM: {text: t('soil.soil_preset.CUSTOM')},
}}
groupProps={{
Expand Down
8 changes: 4 additions & 4 deletions dev-client/src/translations/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,8 +264,8 @@
"depths": {
"title": "Soil Pit Depths",
"preset": {
"LANDPKS": "LandPKS",
"NRCS": "NRCS",
"NRCS": "NRCS/GSP",
"BLM": "BLM Monitoring Standard",
"CUSTOM": "Custom…",
"NONE": "None specified"
},
Expand Down Expand Up @@ -604,8 +604,8 @@
"header": "Change soil pit depths",
"info": "Data already entered for a depth will be deleted when the depth is changed.",
"label": "Depths",
"LANDPKS": "LandPKS (default)",
"NRCS": "NRCS",
"NRCS": "NRCS/GSP (default)",
"BLM": "BLM Monitoring Standard",
"CUSTOM": "Custom"
},
"depth": {
Expand Down
Loading