Skip to content

Commit 1946357

Browse files
jirhikerjirhiker
committed
Merge branch 'staging' into BDMS-520-1-1-Cleanup-2.0
2 parents a1f00e1 + d0b4066 commit 1946357

3 files changed

Lines changed: 97 additions & 56 deletions

File tree

‎admin/views/hydraulicsdata.py‎

Lines changed: 63 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
HydraulicsDataAdmin view for legacy NMA_HydraulicsData.
1818
"""
1919

20+
from starlette.requests import Request
21+
2022
from admin.views.base import OcotilloModelView
2123

2224

@@ -27,44 +29,69 @@ class HydraulicsDataAdmin(OcotilloModelView):
2729

2830
# ========== Basic Configuration ==========
2931

30-
name = "Hydraulics Data"
31-
label = "Hydraulics Data"
32+
name = "NMA Hydraulics Data"
33+
label = "NMA Hydraulics Data"
3234
icon = "fa fa-tint"
3335

34-
can_create = False
35-
can_edit = False
36-
can_delete = False
36+
def can_create(self, request: Request) -> bool:
37+
return False
38+
39+
def can_edit(self, request: Request) -> bool:
40+
return False
41+
42+
def can_delete(self, request: Request) -> bool:
43+
return False
3744

3845
# ========== List View ==========
3946

4047
list_fields = [
4148
"global_id",
4249
"well_id",
4350
"point_id",
51+
"data_source",
4452
"thing_id",
45-
"hydraulic_unit",
46-
"hydraulic_unit_type",
47-
"test_top",
48-
"test_bottom",
53+
"object_id",
54+
"cs_gal_d_ft",
55+
"hd_ft2_d",
56+
"hl_day_1",
57+
"kh_ft_d",
58+
"kv_ft_d",
59+
"p_decimal_fraction",
60+
"s_dimensionless",
61+
"ss_ft_1",
62+
"sy_decimalfractn",
4963
"t_ft2_d",
5064
"k_darcy",
51-
"data_source",
52-
"object_id",
65+
"test_bottom",
66+
"test_top",
67+
"hydraulic_unit",
68+
"hydraulic_unit_type",
69+
"hydraulic_remarks",
5370
]
5471

5572
sortable_fields = [
5673
"global_id",
5774
"well_id",
5875
"point_id",
76+
"data_source",
5977
"thing_id",
60-
"hydraulic_unit",
61-
"hydraulic_unit_type",
62-
"test_top",
63-
"test_bottom",
78+
"object_id",
79+
"cs_gal_d_ft",
80+
"hd_ft2_d",
81+
"hl_day_1",
82+
"kh_ft_d",
83+
"kv_ft_d",
84+
"p_decimal_fraction",
85+
"s_dimensionless",
86+
"ss_ft_1",
87+
"sy_decimalfractn",
6488
"t_ft2_d",
6589
"k_darcy",
66-
"data_source",
67-
"object_id",
90+
"test_bottom",
91+
"test_top",
92+
"hydraulic_unit",
93+
"hydraulic_unit_type",
94+
"hydraulic_remarks",
6895
]
6996

7097
searchable_fields = [
@@ -84,41 +111,41 @@ class HydraulicsDataAdmin(OcotilloModelView):
84111
"global_id",
85112
"well_id",
86113
"point_id",
114+
"data_source",
87115
"thing_id",
88-
"hydraulic_unit",
89-
"hydraulic_unit_type",
90-
"hydraulic_remarks",
91-
"test_top",
92-
"test_bottom",
93-
"t_ft2_d",
94-
"s_dimensionless",
95-
"ss_ft_1",
96-
"sy_decimalfractn",
116+
"object_id",
117+
"cs_gal_d_ft",
118+
"hd_ft2_d",
119+
"hl_day_1",
97120
"kh_ft_d",
98121
"kv_ft_d",
99-
"hl_day_1",
100-
"hd_ft2_d",
101-
"cs_gal_d_ft",
102122
"p_decimal_fraction",
123+
"s_dimensionless",
124+
"ss_ft_1",
125+
"sy_decimalfractn",
126+
"t_ft2_d",
103127
"k_darcy",
104-
"data_source",
105-
"object_id",
128+
"test_bottom",
129+
"test_top",
130+
"hydraulic_unit",
131+
"hydraulic_unit_type",
132+
"hydraulic_remarks",
106133
]
107134

108135
field_labels = {
109136
"global_id": "GlobalID",
110137
"well_id": "WellID",
111138
"point_id": "PointID",
112139
"thing_id": "Thing ID",
113-
"hydraulic_unit": "HydraulicUnit",
114-
"hydraulic_unit_type": "HydraulicUnitType",
140+
"hydraulic_unit": "Hydraulic Unit",
141+
"hydraulic_unit_type": "HydraulicUnit Type",
115142
"hydraulic_remarks": "Hydraulic Remarks",
116-
"test_top": "TestTop",
117-
"test_bottom": "TestBottom",
143+
"test_top": "Test Top",
144+
"test_bottom": "Test Bottom",
118145
"t_ft2_d": "T (ft2/d)",
119146
"s_dimensionless": "S (dimensionless)",
120147
"ss_ft_1": "Ss (ft-1)",
121-
"sy_decimalfractn": "Sy (decimalfractn)",
148+
"sy_decimalfractn": "Sy (decimal fraction)",
122149
"kh_ft_d": "KH (ft/d)",
123150
"kv_ft_d": "KV (ft/d)",
124151
"hl_day_1": "HL (day-1)",

‎admin/views/radionuclides.py‎

Lines changed: 33 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
RadionuclidesAdmin view for legacy NMA_Radionuclides.
1818
"""
1919

20+
from starlette.requests import Request
21+
2022
from admin.views.base import OcotilloModelView
2123

2224

@@ -27,40 +29,57 @@ class RadionuclidesAdmin(OcotilloModelView):
2729

2830
# ========== Basic Configuration ==========
2931

30-
name = "Radionuclides"
31-
label = "Radionuclides"
32+
name = "NMA Radionuclides"
33+
label = "NMA Radionuclides"
3234
icon = "fa fa-radiation"
3335

34-
can_create = False
35-
can_edit = False
36-
can_delete = False
36+
def can_create(self, request: Request) -> bool:
37+
return False
38+
39+
def can_edit(self, request: Request) -> bool:
40+
return False
41+
42+
def can_delete(self, request: Request) -> bool:
43+
return False
3744

3845
# ========== List View ==========
3946

4047
list_fields = [
4148
"global_id",
4249
"sample_pt_id",
4350
"sample_point_id",
44-
"thing_id",
4551
"analyte",
52+
"symbol",
4653
"sample_value",
4754
"units",
55+
"uncertainty",
56+
"analysis_method",
4857
"analysis_date",
58+
"notes",
59+
"volume",
60+
"volume_unit",
61+
"object_id",
4962
"analyses_agency",
63+
"wclab_id",
5064
]
5165

5266
sortable_fields = [
5367
"global_id",
5468
"sample_pt_id",
5569
"sample_point_id",
56-
"thing_id",
5770
"analyte",
71+
"symbol",
5872
"sample_value",
5973
"units",
74+
"uncertainty",
75+
"analysis_method",
6076
"analysis_date",
77+
"notes",
78+
"volume",
79+
"volume_unit",
80+
"object_id",
6181
"analyses_agency",
6282
"wclab_id",
63-
"object_id",
6483
]
6584

6685
fields_default_sort = [("analysis_date", True)]
@@ -87,7 +106,6 @@ class RadionuclidesAdmin(OcotilloModelView):
87106
"global_id",
88107
"sample_pt_id",
89108
"sample_point_id",
90-
"thing_id",
91109
"analyte",
92110
"symbol",
93111
"sample_value",
@@ -106,20 +124,19 @@ class RadionuclidesAdmin(OcotilloModelView):
106124
field_labels = {
107125
"global_id": "GlobalID",
108126
"sample_pt_id": "SamplePtID",
109-
"sample_point_id": "SamplePointID",
110-
"thing_id": "Thing ID",
127+
"sample_point_id": "Sample PointID",
111128
"analyte": "Analyte",
112129
"symbol": "Symbol",
113-
"sample_value": "SampleValue",
130+
"sample_value": "Sample Value",
114131
"units": "Units",
115132
"uncertainty": "Uncertainty",
116-
"analysis_method": "AnalysisMethod",
117-
"analysis_date": "AnalysisDate",
133+
"analysis_method": "Analysis Method",
134+
"analysis_date": "Analysis Date",
118135
"notes": "Notes",
119136
"volume": "Volume",
120-
"volume_unit": "VolumeUnit",
137+
"volume_unit": "Volume Unit",
121138
"object_id": "OBJECTID",
122-
"analyses_agency": "AnalysesAgency",
139+
"analyses_agency": "Analyses Agency",
123140
"wclab_id": "WCLab_ID",
124141
}
125142

‎db/nma_legacy.py‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -552,9 +552,6 @@ class NMA_Radionuclides(Base):
552552
global_id: Mapped[uuid.UUID] = mapped_column(
553553
"GlobalID", UUID(as_uuid=True), primary_key=True
554554
)
555-
thing_id: Mapped[int] = mapped_column(
556-
Integer, ForeignKey("thing.id", ondelete="CASCADE"), nullable=False
557-
)
558555
sample_pt_id: Mapped[uuid.UUID] = mapped_column(
559556
"SamplePtID",
560557
UUID(as_uuid=True),
@@ -584,7 +581,7 @@ class NMA_Radionuclides(Base):
584581
analyses_agency: Mapped[Optional[str]] = mapped_column("AnalysesAgency", String(50))
585582
wclab_id: Mapped[Optional[str]] = mapped_column("WCLab_ID", String(25))
586583

587-
thing: Mapped["Thing"] = relationship("Thing")
584+
# Relationships
588585
chemistry_sample_info: Mapped["NMA_Chemistry_SampleInfo"] = relationship(
589586
"NMA_Chemistry_SampleInfo", back_populates="radionuclides"
590587
)

0 commit comments

Comments
 (0)