Merge branch 'main' into fix-stratigraphy-add-button

swisstopo · Aug 21, 2024 · 950a9a2 · 950a9a2
2 parents 118a2f7 + 2f2e723
commit 950a9a2
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/src/api-legacy/v1/action.py b/src/api-legacy/v1/action.py
@@ -47,6 +47,12 @@ def getordering(self, orderby, direction):
         elif orderby == 'restriction':
             _orderby = 'restriction_id_cli'
 
+        elif orderby == 'location_x':
+            _orderby = 'location_x_bho'
+
+        elif orderby == 'location_y':
+            _orderby = 'location_y_bho'
+
         elif orderby == 'elevation_z':
             _orderby = 'elevation_z_bho'
 

diff --git a/src/client/src/pages/overview/boreholeTable/boreholeTable.tsx b/src/client/src/pages/overview/boreholeTable/boreholeTable.tsx
@@ -110,10 +110,26 @@ export const BoreholeTable: FC<BoreholeTableProps> = ({
       headerName: t("reference_elevation"),
       flex: 1,
     },
+    {
+      field: "location_x",
+      valueGetter: (value, row) => {
+        return `${Math.round(row.location_x * 100) / 100 || "-"}`;
+      },
+      headerName: t("location_x"),
+      flex: 1,
+    },
+    {
+      field: "location_y",
+      valueGetter: (value, row) => {
+        return `${Math.round(row.location_y * 100) / 100 || "-"}`;
+      },
+      headerName: t("location_y"),
+      flex: 1,
+    },
     {
       field: "lock",
       headerName: "",
-      width: 70,
+      width: 20,
       renderCell: value => {
         if (value.row.lock) {
           return (