Merge branch 'main' into json-export-endpoint

Author: Lehats

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Changed 
 - Removed attachments from csv import.
 - Updated recommended csv headers for borehole import to camel case e.g. `OriginalName` (snake case e.g. `original_name` is still supported for all properties except for custom identifiers).
+- Changed order of `Top Bedrock (fresh)` and `Top Bedrock (weathered)` fields in borehole form.
 
 ### Fixed
 

src/client/src/pages/detail/form/borehole/boreholeForm.tsx

@@ -140,29 +140,29 @@ export const BoreholeForm = forwardRef(({ borehole, editingEnabled, onSubmit }:
               </FormContainer>
               <FormContainer direction="row">
                 <FormInput
-                  fieldName={"topBedrockFreshMd"}
-                  label={"top_bedrock_fresh_md"}
-                  value={borehole?.topBedrockFreshMd || ""}
+                  fieldName={"topBedrockWeatheredMd"}
+                  label={"top_bedrock_weathered_md"}
+                  value={borehole?.topBedrockWeatheredMd || ""}
                   withThousandSeparator={true}
                   readonly={!editingEnabled}
                 />
                 <FormInputDisplayOnly
-                  label={"top_bedrock_fresh_tvd"}
-                  value={topBedrockFreshTVD}
+                  label={"top_bedrock_weathered_tvd"}
+                  value={topBedrockWeatheredTVD}
                   withThousandSeparator={true}
                 />
               </FormContainer>
               <FormContainer direction="row">
                 <FormInput
-                  fieldName={"topBedrockWeatheredMd"}
-                  label={"top_bedrock_weathered_md"}
-                  value={borehole?.topBedrockWeatheredMd || ""}
+                  fieldName={"topBedrockFreshMd"}
+                  label={"top_bedrock_fresh_md"}
+                  value={borehole?.topBedrockFreshMd || ""}
                   withThousandSeparator={true}
                   readonly={!editingEnabled}
                 />
                 <FormInputDisplayOnly
-                  label={"top_bedrock_weathered_tvd"}
-                  value={topBedrockWeatheredTVD}
+                  label={"top_bedrock_fresh_tvd"}
+                  value={topBedrockFreshTVD}
                   withThousandSeparator={true}
                 />
               </FormContainer>