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.

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

Fix borehole tab layout #1713

Merged
merged 3 commits into from
Nov 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
- Changes on the location tab and the borehole tab are now saved by clicking the `Save` button, instead of immediately.
- The `alternate_name` is now displayed in the borehole detail header and the map markers.
- From depth and to depth are no longer displayed in groundwater level measurements.
- Updated the layout of the borehole general tab.

### Fixed

Expand Down
60 changes: 32 additions & 28 deletions src/client/src/pages/detail/form/borehole/boreholeForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -135,34 +135,38 @@ export const BoreholeForm = ({ formMethods, borehole, editingEnabled }: Borehole
withThousandSeparator={true}
/>
</FormContainer>
<FormDomainSelect
fieldName={"lithologyTopBedrockId"}
label={"lithology_top_bedrock"}
schemaName={"custom.lithology_top_bedrock"}
readonly={!editingEnabled}
selected={borehole.lithologyTopBedrockId}
/>
<FormDomainSelect
fieldName={"lithostratigraphyId"}
label={"lithostratigraphy_top_bedrock"}
schemaName={"custom.lithostratigraphy_top_bedrock"}
readonly={!editingEnabled}
selected={borehole.lithostratigraphyId}
/>
<FormDomainSelect
fieldName={"chronostratigraphyId"}
label={"chronostratigraphy_top_bedrock"}
schemaName={"custom.chronostratigraphy_top_bedrock"}
readonly={!editingEnabled}
selected={borehole.chronostratigraphyId}
/>
<FormBooleanSelect
canReset={false}
readonly={!editingEnabled}
fieldName={"hasGroundwater"}
label="groundwater"
selected={borehole.hasGroundwater}
/>
<FormContainer direction="row">
<FormDomainSelect
fieldName={"lithologyTopBedrockId"}
label={"lithology_top_bedrock"}
schemaName={"custom.lithology_top_bedrock"}
readonly={!editingEnabled}
selected={borehole.lithologyTopBedrockId}
/>
<FormDomainSelect
fieldName={"lithostratigraphyId"}
label={"lithostratigraphy_top_bedrock"}
schemaName={"custom.lithostratigraphy_top_bedrock"}
readonly={!editingEnabled}
selected={borehole.lithostratigraphyId}
/>
</FormContainer>
<FormContainer direction="row">
<FormDomainSelect
fieldName={"chronostratigraphyId"}
label={"chronostratigraphy_top_bedrock"}
schemaName={"custom.chronostratigraphy_top_bedrock"}
readonly={!editingEnabled}
selected={borehole.chronostratigraphyId}
/>
<FormBooleanSelect
canReset={false}
readonly={!editingEnabled}
fieldName={"hasGroundwater"}
label="groundwater"
selected={borehole.hasGroundwater}
/>
</FormContainer>
<FormInput
fieldName={"remarks"}
multiline={true}
Expand Down
Loading