From 8cc1420d93b4b8b2c365e7c8e67186cd7a447e7f Mon Sep 17 00:00:00 2001 From: Kelsey Smuczynski Date: Thu, 29 Jan 2026 15:46:57 -0700 Subject: [PATCH 1/3] refactor: align HydraulicsDataAdmin fields with legacy model - Include all HydraulicsData columns in list and detail views - Order fields to match the legacy model definition --- admin/views/hydraulicsdata.py | 94 ++++++++++++++++++++++------------- 1 file changed, 60 insertions(+), 34 deletions(-) diff --git a/admin/views/hydraulicsdata.py b/admin/views/hydraulicsdata.py index d081dbce2..e69b9769b 100644 --- a/admin/views/hydraulicsdata.py +++ b/admin/views/hydraulicsdata.py @@ -16,6 +16,7 @@ """ HydraulicsDataAdmin view for legacy NMA_HydraulicsData. """ +from starlette.requests import Request from admin.views.base import OcotilloModelView @@ -31,9 +32,14 @@ class HydraulicsDataAdmin(OcotilloModelView): label = "Hydraulics Data" icon = "fa fa-tint" - can_create = False - can_edit = False - can_delete = False + def can_create(self, request: Request) -> bool: + return False + + def can_edit(self, request: Request) -> bool: + return False + + def can_delete(self, request: Request) -> bool: + return False # ========== List View ========== @@ -41,30 +47,50 @@ class HydraulicsDataAdmin(OcotilloModelView): "global_id", "well_id", "point_id", + "data_source", "thing_id", - "hydraulic_unit", - "hydraulic_unit_type", - "test_top", - "test_bottom", + "object_id", + "cs_gal_d_ft", + "hd_ft2_d", + "hl_day_1", + "kh_ft_d", + "kv_ft_d", + "p_decimal_fraction", + "s_dimensionless", + "ss_ft_1", + "sy_decimalfractn", "t_ft2_d", "k_darcy", - "data_source", - "object_id", + "test_bottom", + "test_top", + "hydraulic_unit", + "hydraulic_unit_type", + "hydraulic_remarks", ] sortable_fields = [ "global_id", "well_id", "point_id", + "data_source", "thing_id", - "hydraulic_unit", - "hydraulic_unit_type", - "test_top", - "test_bottom", + "object_id", + "cs_gal_d_ft", + "hd_ft2_d", + "hl_day_1", + "kh_ft_d", + "kv_ft_d", + "p_decimal_fraction", + "s_dimensionless", + "ss_ft_1", + "sy_decimalfractn", "t_ft2_d", "k_darcy", - "data_source", - "object_id", + "test_bottom", + "test_top", + "hydraulic_unit", + "hydraulic_unit_type", + "hydraulic_remarks", ] searchable_fields = [ @@ -84,25 +110,25 @@ class HydraulicsDataAdmin(OcotilloModelView): "global_id", "well_id", "point_id", + "data_source", "thing_id", - "hydraulic_unit", - "hydraulic_unit_type", - "hydraulic_remarks", - "test_top", - "test_bottom", - "t_ft2_d", - "s_dimensionless", - "ss_ft_1", - "sy_decimalfractn", + "object_id", + "cs_gal_d_ft", + "hd_ft2_d", + "hl_day_1", "kh_ft_d", "kv_ft_d", - "hl_day_1", - "hd_ft2_d", - "cs_gal_d_ft", "p_decimal_fraction", + "s_dimensionless", + "ss_ft_1", + "sy_decimalfractn", + "t_ft2_d", "k_darcy", - "data_source", - "object_id", + "test_bottom", + "test_top", + "hydraulic_unit", + "hydraulic_unit_type", + "hydraulic_remarks", ] field_labels = { @@ -110,15 +136,15 @@ class HydraulicsDataAdmin(OcotilloModelView): "well_id": "WellID", "point_id": "PointID", "thing_id": "Thing ID", - "hydraulic_unit": "HydraulicUnit", - "hydraulic_unit_type": "HydraulicUnitType", + "hydraulic_unit": "Hydraulic Unit", + "hydraulic_unit_type": "HydraulicUnit Type", "hydraulic_remarks": "Hydraulic Remarks", - "test_top": "TestTop", - "test_bottom": "TestBottom", + "test_top": "Test Top", + "test_bottom": "Test Bottom", "t_ft2_d": "T (ft2/d)", "s_dimensionless": "S (dimensionless)", "ss_ft_1": "Ss (ft-1)", - "sy_decimalfractn": "Sy (decimalfractn)", + "sy_decimalfractn": "Sy (decimal fraction)", "kh_ft_d": "KH (ft/d)", "kv_ft_d": "KV (ft/d)", "hl_day_1": "HL (day-1)", From 7baacb38bfcc0e45879fa16cbdab231b1b237891 Mon Sep 17 00:00:00 2001 From: ksmuczynski Date: Thu, 29 Jan 2026 22:47:24 +0000 Subject: [PATCH 2/3] Formatting changes --- admin/views/hydraulicsdata.py | 1 + 1 file changed, 1 insertion(+) diff --git a/admin/views/hydraulicsdata.py b/admin/views/hydraulicsdata.py index e69b9769b..5cdfc2815 100644 --- a/admin/views/hydraulicsdata.py +++ b/admin/views/hydraulicsdata.py @@ -16,6 +16,7 @@ """ HydraulicsDataAdmin view for legacy NMA_HydraulicsData. """ + from starlette.requests import Request from admin.views.base import OcotilloModelView From d84445a105ffaa14785d0ed2b3deb00005277c1a Mon Sep 17 00:00:00 2001 From: Kelsey Smuczynski Date: Thu, 29 Jan 2026 15:58:51 -0700 Subject: [PATCH 3/3] refactor: update HydraulicsData naming to include NMA prefix --- admin/views/hydraulicsdata.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/views/hydraulicsdata.py b/admin/views/hydraulicsdata.py index 5cdfc2815..5d2baa360 100644 --- a/admin/views/hydraulicsdata.py +++ b/admin/views/hydraulicsdata.py @@ -29,8 +29,8 @@ class HydraulicsDataAdmin(OcotilloModelView): # ========== Basic Configuration ========== - name = "Hydraulics Data" - label = "Hydraulics Data" + name = "NMA Hydraulics Data" + label = "NMA Hydraulics Data" icon = "fa fa-tint" def can_create(self, request: Request) -> bool: