Merge pull request #423 from DataIntegrationGroup/staging-misc

feat: add field parameters transfer and associated metrics handling

Author: chasetmartin

admin/config.py

@@ -51,9 +51,9 @@
     ThingAdmin,
     TransducerObservationAdmin,
 )
-from db.asset import Asset
 from db.aquifer_system import AquiferSystem
 from db.aquifer_type import AquiferType
+from db.asset import Asset
 from db.contact import Contact
 from db.data_provenance import DataProvenance
 from db.deployment import Deployment
@@ -64,13 +64,13 @@
 from db.lexicon import LexiconCategory, LexiconTerm
 from db.location import Location
 from db.nma_legacy import (
-    ChemistrySampleInfo,
-    NMAMinorTraceChemistry,
-    NMARadionuclides,
-    NMAHydraulicsData,
-    SoilRockResults,
-    Stratigraphy,
-    SurfaceWaterData,
+    NMA_Chemistry_SampleInfo,
+    NMA_MinorTraceChemistry,
+    NMA_Radionuclides,
+    NMA_HydraulicsData,
+    NMA_Soil_Rock_Results,
+    NMA_Stratigraphy,
+    NMA_SurfaceWaterData,
 )
 from db.notes import Notes
 from db.observation import Observation
@@ -140,13 +140,13 @@ def create_admin(app):
 
     # Samples
     admin.add_view(SampleAdmin(Sample))
-    admin.add_view(ChemistrySampleInfoAdmin(ChemistrySampleInfo))
-    admin.add_view(SurfaceWaterDataAdmin(SurfaceWaterData))
+    admin.add_view(ChemistrySampleInfoAdmin(NMA_Chemistry_SampleInfo))
+    admin.add_view(SurfaceWaterDataAdmin(NMA_SurfaceWaterData))
 
     # Hydraulics
-    admin.add_view(HydraulicsDataAdmin(NMAHydraulicsData))
-    admin.add_view(RadionuclidesAdmin(NMARadionuclides))
-    admin.add_view(MinorTraceChemistryAdmin(NMAMinorTraceChemistry))
+    admin.add_view(HydraulicsDataAdmin(NMA_HydraulicsData))
+    admin.add_view(RadionuclidesAdmin(NMA_Radionuclides))
+    admin.add_view(MinorTraceChemistryAdmin(NMA_MinorTraceChemistry))
 
     # Field
     admin.add_view(FieldEventAdmin(FieldEvent))
@@ -169,10 +169,10 @@ def create_admin(app):
     admin.add_view(LexiconCategoryAdmin(LexiconCategory))
 
     # Stratigraphy
-    admin.add_view(StratigraphyAdmin(Stratigraphy))
+    admin.add_view(StratigraphyAdmin(NMA_Stratigraphy))
 
     # SoilRockResults
-    admin.add_view(SoilRockResultsAdmin(SoilRockResults))
+    admin.add_view(SoilRockResultsAdmin(NMA_Soil_Rock_Results))
 
     # Future: Add more views here as they are implemented
     # admin.add_view(SampleAdmin)

admin/views/hydraulicsdata.py

@@ -22,7 +22,7 @@
 
 class HydraulicsDataAdmin(OcotilloModelView):
     """
-    Admin view for NMAHydraulicsData model.
+    Admin view for NMA_HydraulicsData model.
     """
 
     # ========== Basic Configuration ==========

admin/views/minor_trace_chemistry.py

@@ -17,6 +17,8 @@
 MinorTraceChemistryAdmin view for legacy NMA_MinorTraceChemistry.
 """
 
+import uuid
+
 from starlette.requests import Request
 from starlette_admin.fields import HasOne
 
@@ -25,14 +27,17 @@
 
 class MinorTraceChemistryAdmin(OcotilloModelView):
     """
-    Admin view for NMAMinorTraceChemistry model.
+    Admin view for NMA_MinorTraceChemistry model.
     """
 
     # ========== Basic Configuration ==========
 
+    identity = "n-m-a_-minor-trace-chemistry"
     name = "Minor Trace Chemistry"
     label = "Minor Trace Chemistry"
     icon = "fa fa-flask"
+    pk_attr = "global_id"
+    pk_type = uuid.UUID
 
     def can_create(self, request: Request) -> bool:
         return False
@@ -47,7 +52,7 @@ def can_delete(self, request: Request) -> bool:
 
     list_fields = [
         "global_id",
-        HasOne("chemistry_sample_info", identity="chemistry-sample-info"),
+        HasOne("chemistry_sample_info", identity="n-m-a_-chemistry_-sample-info"),
         "analyte",
         "sample_value",
         "units",
@@ -84,7 +89,7 @@ def can_delete(self, request: Request) -> bool:
 
     fields = [
         "global_id",
-        HasOne("chemistry_sample_info", identity="chemistry-sample-info"),
+        HasOne("chemistry_sample_info", identity="n-m-a_-chemistry_-sample-info"),
         "analyte",
         "symbol",
         "sample_value",

admin/views/radionuclides.py

@@ -22,7 +22,7 @@
 
 class RadionuclidesAdmin(OcotilloModelView):
     """
-    Admin view for NMARadionuclides model.
+    Admin view for NMA_Radionuclides model.
     """
 
     # ========== Basic Configuration ==========

alembic/versions/6e1c90f6135a_add_unique_constraint_to_.py

@@ -1,4 +1,4 @@
-"""add unique constraint to NMAMinorTraceChemistry
+"""add unique constraint to NMA_MinorTraceChemistry
 
 Revision ID: 6e1c90f6135a
 Revises: 95d8b982cd5d
@@ -9,9 +9,6 @@
 from typing import Sequence, Union
 
 from alembic import op
-import geoalchemy2
-import sqlalchemy as sa
-import sqlalchemy_utils
 
 # revision identifiers, used by Alembic.
 revision: str = "6e1c90f6135a"

alembic/versions/7c02d9f8f412_create_nmawaterlevelscontinuouspressuredaily.py

@@ -1,4 +1,4 @@
-"""Create legacy NMAWaterLevelsContinuousPressureDaily table.
+"""Create legacy NMA_WaterLevelsContinuous_Pressure_Daily table.
 
 Revision ID: 7c02d9f8f412
 Revises: 2101e0b029dc
@@ -7,8 +7,8 @@
 
 from typing import Sequence, Union
 
-from alembic import op
 import sqlalchemy as sa
+from alembic import op
 from sqlalchemy import inspect
 
 # revision identifiers, used by Alembic.