Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions admin/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
DataProvenanceAdmin,
FieldEventAdmin,
FieldActivityAdmin,
FieldEventParticipantAdmin,
ParameterAdmin,
)
from db.engine import engine
Expand All @@ -62,8 +61,7 @@
from db.sample import Sample
from db.geologic_formation import GeologicFormation
from db.data_provenance import DataProvenance
from db.field import FieldEvent, FieldActivity, FieldEventParticipant
from db.permission_history import PermissionHistory
from db.field import FieldEvent, FieldActivity
from db.parameter import Parameter


Expand Down
2 changes: 2 additions & 0 deletions admin/views/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
from admin.views.group import GroupAdmin
from admin.views.notes import NotesAdmin
from admin.views.sample import SampleAdmin
from admin.views.chemistry_sampleinfo import ChemistrySampleInfoAdmin
Comment on lines 33 to +34

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Register the new admin view so it is reachable

The new ChemistrySampleInfoAdmin class is exported here, but create_admin in admin/config.py never imports it or calls admin.add_view(...) for it. As a result, the admin UI will not show the “Chemistry Sample Info” menu and the legacy records are still inaccessible, which contradicts the stated goal of exposing the table. Consider adding the model and view registration in create_admin so the view is actually mounted.

Useful? React with 👍 / 👎.

from admin.views.geologic_formation import GeologicFormationAdmin
from admin.views.data_provenance import DataProvenanceAdmin
from admin.views.field import (
Expand All @@ -55,6 +56,7 @@
"GroupAdmin",
"NotesAdmin",
"SampleAdmin",
"ChemistrySampleInfoAdmin",
"GeologicFormationAdmin",
"DataProvenanceAdmin",
"FieldEventAdmin",
Expand Down
140 changes: 140 additions & 0 deletions admin/views/chemistry_sampleinfo.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,140 @@
# ===============================================================================
# Copyright 2026
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# ===============================================================================
"""
ChemistrySampleInfoAdmin view for legacy Chemistry_SampleInfo.
"""
from admin.views.base import OcotilloModelView


class ChemistrySampleInfoAdmin(OcotilloModelView):
"""
Admin view for ChemistrySampleInfo model.
"""

# ========== Basic Configuration ==========

name = "Chemistry Sample Info"
label = "Chemistry Sample Info"
icon = "fa fa-flask"

# ========== List View ==========

column_list = [
"object_id",
"sample_point_id",
"sample_pt_id",
"wclab_id",
"collection_date",
"sample_type",
"data_source",
"data_quality",
"public_release",
]

column_sortable_list = [
"object_id",
"sample_point_id",
"sample_pt_id",
"wclab_id",
"collection_date",
"sample_type",
"data_source",
"data_quality",
"public_release",
]

column_default_sort = ("collection_date", True)

search_fields = [
"sample_point_id",
"sample_pt_id",
"wclab_id",
"collected_by",
"analyses_agency",
"sample_notes",
]

column_filters = [
"collection_date",
"sample_type",
"sample_material_not_h2o",
"water_type",
"study_sample",
"data_source",
"data_quality",
"public_release",
]

can_export = True
export_types = ["csv", "excel"]

page_size = 50
page_size_options = [25, 50, 100, 200]

# ========== Form View ==========

fields = [
"object_id",
"sample_point_id",
"sample_pt_id",
"wclab_id",
"collection_date",
"collection_method",
"collected_by",
"analyses_agency",
"sample_type",
"sample_material_not_h2o",
"water_type",
"study_sample",
"data_source",
"data_quality",
"public_release",
"added_day_to_date",
"added_month_day_to_date",
"sample_notes",
]

exclude_fields_from_create = [
"object_id",
]

exclude_fields_from_edit = [
"object_id",
]

labels = {
"object_id": "OBJECTID",
"sample_point_id": "SamplePointID",
"sample_pt_id": "SamplePtID",
"wclab_id": "WCLab ID",
"collection_date": "Collection Date",
"collection_method": "Collection Method",
"collected_by": "Collected By",
"analyses_agency": "Analyses Agency",
"sample_type": "Sample Type",
"sample_material_not_h2o": "Sample Material Not H2O",
"water_type": "Water Type",
"study_sample": "Study Sample",
"data_source": "Data Source",
"data_quality": "Data Quality",
"public_release": "Public Release",
"added_day_to_date": "Added Day to Date",
"added_month_day_to_date": "Added Month Day to Date",
"sample_notes": "Sample Notes",
}


# ============= EOF =============================================
Loading