From 532f88baa7e3839b92f1ae6014ce38ed93888614 Mon Sep 17 00:00:00 2001
From: MiraGeowerkstatt <mira.bleuler@geowerkstatt.ch>
Date: Thu, 28 Nov 2024 15:07:15 +0100
Subject: [PATCH 1/2] Fix borehole tab layout

---
 .../detail/form/borehole/boreholeForm.tsx     | 60 ++++++++++---------
 1 file changed, 32 insertions(+), 28 deletions(-)

diff --git a/src/client/src/pages/detail/form/borehole/boreholeForm.tsx b/src/client/src/pages/detail/form/borehole/boreholeForm.tsx
index 2379033c6..2d105378f 100644
--- a/src/client/src/pages/detail/form/borehole/boreholeForm.tsx
+++ b/src/client/src/pages/detail/form/borehole/boreholeForm.tsx
@@ -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}

From 25be96baad16f2e89975f21c81abd2797422eaf6 Mon Sep 17 00:00:00 2001
From: MiraGeowerkstatt <mira.bleuler@geowerkstatt.ch>
Date: Thu, 28 Nov 2024 15:08:06 +0100
Subject: [PATCH 2/2] Add release notes

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb5ac3f47..e47c67ed7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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