Boreholes table

CHANGELOG.md

@@ -24,6 +24,7 @@
 - Removed unused `IsViewer` flag from user.
 - Removed unused `UserEvent` from user.
 - Migrated `User` API endpoints to .NET API.
+- Changed boreholes table design.
 - Migrated `Workgroup` API endpoints to .NET API.
 - Use `filled` style for form components.
 

config/create-user.sql

@@ -3,5 +3,5 @@ INSERT INTO bdms.users
 VALUES
     (
         NOW(), true, 'GeoWerkstatt',
-        '{"filter": {"custom": {"borehole_identifier": true, "project_name": true, "landuse": true, "alternate_name": true, "canton": true, "city": true}, "restriction": true, "restriction_until": true, "extended": {"original_name": true, "method": true, "status": true}, "kind": true, "elevation_z": true, "length": true, "drilling_date": true, "zoom2selected": true}, "boreholetable": {"orderby": "original_name", "direction": "ASC"}, "eboreholetable": {"orderby": "creation", "direction": "DESC"}, "map": {"explorer": {}, "editor": {}}, "appearance": {"explorer": 1}}',
+        '{"filter": {"custom": {"borehole_identifier": true, "project_name": true, "landuse": true, "alternate_name": true, "canton": true, "city": true}, "restriction": true, "restriction_until": true, "extended": {"original_name": true, "method": true, "status": true}, "kind": true, "elevation_z": true, "length": true, "drilling_date": true, "zoom2selected": true}, "boreholetable": {"orderby": "original_name", "direction": "ASC"}, "eboreholetable": {"orderby": "original_name", "direction": "ASC"}, "map": {"explorer": {}, "editor": {}}, "appearance": {"explorer": 1}}',
         'GeoWerkstatt', 'user');

db/03-data.sql

@@ -17,8 +17,8 @@ VALUES
         '        "direction": "ASC"'
         '    },'
         '    "eboreholetable": {'
-        '        "orderby": "creation",'
-        '        "direction": "DESC"'
+        '        "orderby": "original_name",'
+        '        "direction": "ASC"'
         '    },'
         '   "map": {'
         '       "explorer": {},'
@@ -66,7 +66,7 @@ SELECT pg_catalog.setval('bdms.workgroups_id_wgp_seq', 2, false);
 
 INSERT INTO bdms.users VALUES (
     1, NULL, true, true, 'admin', crypt('swissforages', gen_salt('md5')),
-'{"filter": {"custom": {"borehole_identifier": true, "project_name": true, "landuse": true, "alternate_name": true, "canton": true, "city": true}, "restriction": true, "restriction_until": true, "extended": {"original_name": true, "method": true, "status": true}, "kind": true, "elevation_z": true, "length": true, "drilling_date": true, "zoom2selected": true}, "boreholetable": {"orderby": "original_name", "direction": "ASC"}, "eboreholetable": {"orderby": "creation", "direction": "DESC"}, "map": {"explorer": {}, "editor": {}}, "appearance": {"explorer": 1}}',
+'{"filter": {"custom": {"borehole_identifier": true, "project_name": true, "landuse": true, "alternate_name": true, "canton": true, "city": true}, "restriction": true, "restriction_until": true, "extended": {"original_name": true, "method": true, "status": true}, "kind": true, "elevation_z": true, "length": true, "drilling_date": true, "zoom2selected": true}, "boreholetable": {"orderby": "original_name", "direction": "ASC"}, "eboreholetable": {"orderby": "original_name", "direction": "ASC"}, "map": {"explorer": {}, "editor": {}}, "appearance": {"explorer": 1}}',
 'admin', NULL, 'user');
 
 INSERT INTO bdms.users_roles(

src/api-legacy/v1/action.py

@@ -90,6 +90,12 @@ def getordering(self, orderby, direction):
         elif orderby == 'totaldepth':
             _orderby = 'total_depth'
 
+        elif orderby == 'total_depth':
+            _orderby = 'total_depth'
+
+        elif orderby == 'reference_elevation':
+            _orderby = 'reference_elevation_bho'
+
         elif orderby == 'top_bedrock_fresh_md':
             _orderby = 'top_bedrock_fresh_md'
 

src/api-legacy/v1/borehole/editinglist.py

@@ -98,15 +98,18 @@ async def execute(
                 precision_location_y,
                 precision_location_x_lv03,
                 precision_location_y_lv03,
+                reference_elevation_bho as reference_elevation,
                 srs_id_cli as spatial_reference_system,
                 elevation_z_bho as elevation_z,
                 hrs_id_cli as height_reference_system,
                 total_depth_bho as total_depth,
+
                 (
                     select row_to_json(t)
                     FROM (
                         SELECT
-                            status_id_cli as status
+                            status_id_cli as status,
+                            purpose_id_cli as purpose
                     ) t
                 ) as extended,
                 stratigraphy as stratigraphy,

src/api-legacy/v1/borehole/producer.py

@@ -191,26 +191,25 @@ async def execute(self, request):
                         request['orderby'] is not None
                     ) and (
                         'orderby' in self.user['setting']['eboreholetable'] and
-                        self.user[
-                            'setting'
-                        ]['eboreholetable']['orderby'] != request['orderby']
+                        ('orderby' not in self.user['setting']['eboreholetable'] or
+                        self.user['setting']['eboreholetable']['orderby'] != request['orderby'])
                     ):
                         await (PatchSetting(conn)).execute(
                             self.user['id'],
                             'eboreholetable.orderby',
                             request['orderby']
                         )
                     else:
-                        request['orderby'] = self.user[
-                            'setting'
-                        ]['eboreholetable']['orderby']
+                        if 'orderby' in self.user['setting']['eboreholetable']:
+                            request['orderby'] = self.user[
+                                'setting'
+                            ]['eboreholetable']['orderby']
 
                     if 'direction' in request and (
                         request['direction'] is not None
                     ) and (
-                        self.user[
-                            'setting'
-                        ]['eboreholetable']['direction'] != request['direction']
+                        ('direction' not in self.user['setting']['eboreholetable'] or
+                        self.user['setting']['eboreholetable']['direction'] != request['direction'])
                     ):
                         await (PatchSetting(conn)).execute(
                             self.user['id'],

src/api-legacy/v1/setting/patch.py

@@ -118,8 +118,8 @@ async def execute(self, user_id, tree, value, key=None):
                             "direction": "ASC"
                         },
                         "eboreholetable": {
-                            "orderby": "creation",
-                            "direction": "DESC"
+                            "orderby": "original_name",
+                            "direction": "ASC"
                         },
                         "map": {
                             "explorer": {},

src/api/Controllers/UserController.cs

@@ -88,7 +88,7 @@ public ActionResult ResetAllSettings()
     {
         // Reset admin settings to initial state
         context.Database.ExecuteSqlRaw("UPDATE bdms.users SET settings_usr = null;");
-        context.Database.ExecuteSqlRaw("UPDATE bdms.users SET settings_usr = '{{\"filter\": {{\"custom\": {{\"borehole_identifier\": true, \"project_name\": true, \"landuse\": true, \"alternate_name\": true, \"canton\": true, \"city\": true}}, \"restriction\": true, \"restriction_until\": true, \"extended\": {{ \"original_name\": true, \"method\": true, \"status\": true}}, \"kind\": true, \"elevation_z\": true, \"length\": true, \"drilling_date\": true, \"zoom2selected\": true}}, \"boreholetable\": {{ \"orderby\": \"original_name\", \"direction\": \"ASC\"}}, \"eboreholetable\": {{ \"orderby\": \"creation\", \"direction\": \"DESC\"}}, \"map\": {{ \"explorer\": {{ }}, \"editor\": {{ }} }}, \"appearance\": {{ \"explorer\": 1}}}}' WHERE username = 'admin';");
+        context.Database.ExecuteSqlRaw("UPDATE bdms.users SET settings_usr = '{{\"filter\": {{\"custom\": {{\"borehole_identifier\": true, \"project_name\": true, \"landuse\": true, \"alternate_name\": true, \"canton\": true, \"city\": true}}, \"restriction\": true, \"restriction_until\": true, \"extended\": {{ \"original_name\": true, \"method\": true, \"status\": true}}, \"kind\": true, \"elevation_z\": true, \"length\": true, \"drilling_date\": true, \"zoom2selected\": true}}, \"boreholetable\": {{ \"orderby\": \"original_name\", \"direction\": \"ASC\"}}, \"eboreholetable\": {{ \"orderby\": \"original_name\", \"direction\": \"ASC\"}}, \"map\": {{ \"explorer\": {{ }}, \"editor\": {{ }} }}, \"appearance\": {{ \"explorer\": 1}}}}' WHERE username = 'admin';");
 
         // Reset codelist settings to initial state
         context.Database.ExecuteSqlRaw("UPDATE bdms.codelist SET conf_cli = '{{\"text\": \"lithology_id_cli\", \"color\": \"lithostratigraphy\", \"title\": \"lithostratigraphy_id_cli\", \"fields\": {{\"color\": true, \"notes\": true, \"debris\": true, \"striae\": true, \"uscs_1\": true, \"uscs_2\": true, \"uscs_3\": true, \"geology\": true, \"cohesion\": true, \"humidity\": true, \"jointing\": true, \"lithology\": true, \"alteration\": true, \"plasticity\": true, \"soil_state\": true, \"compactness\": true, \"consistance\": true, \"description\": true, \"grain_shape\": true, \"lit_pet_deb\": true, \"grain_size_1\": true, \"grain_size_2\": true, \"tectonic_unit\": true, \"uscs_original\": true, \"description_quality\": true, \"grain_granularity\": true, \"lithostratigraphy\": true, \"organic_component\": true, \"chronostratigraphy\": true, \"further_properties\": true, \"uscs_determination\": true}}, \"textNS\": \"custom.lithology_top_bedrock\", \"colorNS\": \"custom.lithostratigraphy_top_bedrock\", \"pattern\": \"lithology\", \"titleNS\": \"custom.chro_str_top_bedrock\", \"patternNS\": \"custom.lithology_top_bedrock\"}}' WHERE conf_cli IS NOT NULL and schema_cli = 'layer_kind';");