Skip to content

Pre production #145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TylerAdamMartinez merged 9 commits into from
Jan 9, 2026
Merged

Pre production #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7d24a80
[ObservationsSelection] Update observation row to use property_type_i…
TylerAdamMartinez Dec 17, 2025
364684c
[routes/well_measurements] Update woodpecker endpoint to fetch json f…
TylerAdamMartinez Dec 30, 2025
86a1386
[routes/activities] Add /activities/{activity_id}/photo/{photo_file_n…
TylerAdamMartinez Dec 31, 2025
59d0372
[ActivityPhotoView] Add new view
TylerAdamMartinez Dec 31, 2025
52467af
[routes/OSE] Update shared_history endpoint to include meter photos
TylerAdamMartinez Dec 31, 2025
f3b4e81
[routes/well_measurements] PDF now displays plot outside the plot
TylerAdamMartinez Dec 31, 2025
f672bba
[routes/maintenance] Rm pie charts & add totals to pdf
TylerAdamMartinez Dec 31, 2025
34c2e48
[WellManagement] Add logic to invalidate cache of wells if then change
TylerAdamMartinez Jan 1, 2026
919885a
[frontend/package] Update react-router from 6.4.2 to 6.30.3
TylerAdamMartinez Jan 9, 2026
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
8 changes: 6 additions & 2 deletions api/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,18 @@
from starlette import status
from api.schemas import security_schemas
from api.models.main_models import Users
from api.routes.activities import activity_router
from api.routes.activities import activity_router, public_activity_router
from api.routes.admin import admin_router
from api.routes.chlorides import authenticated_chlorides_router, public_chlorides_router
from api.routes.maintenance import maintenance_router
from api.routes.meters import authenticated_meter_router, public_meter_router
from api.routes.OSE import ose_router
from api.routes.parts import part_router
from api.routes.settings import settings_router
from api.routes.well_measurements import authenticated_well_measurement_router, public_well_measurement_router
from api.routes.well_measurements import (
authenticated_well_measurement_router,
public_well_measurement_router,
)
from api.routes.wells import authenticated_well_router, public_well_router
from api.security import (
authenticate_user,
Expand Down Expand Up @@ -123,6 +126,7 @@ def login_for_access_token(
add_pagination(app)

app.include_router(ose_router)
app.include_router(public_activity_router)
app.include_router(public_meter_router)
app.include_router(public_well_router)
app.include_router(public_chlorides_router)
Expand Down
81 changes: 55 additions & 26 deletions api/models/main_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,9 @@ class Meters(Base):
location_id: Mapped[int] = mapped_column(
Integer, ForeignKey("Locations.id"), nullable=False
)
register_id: Mapped[int] = mapped_column(Integer, ForeignKey("meter_registers.id"), nullable=True)
register_id: Mapped[int] = mapped_column(
Integer, ForeignKey("meter_registers.id"), nullable=True
)

water_users: Mapped[Optional[str]] = mapped_column(String)
meter_owner: Mapped[Optional[str]] = mapped_column(String)
Expand All @@ -174,7 +176,6 @@ class Meters(Base):
location: Mapped["Locations"] = relationship()



class MeterTypeLU(Base):
"""
Meter types
Expand Down Expand Up @@ -238,14 +239,23 @@ class MeterActivities(Base):
)
notes: Mapped[List["NoteTypeLU"]] = relationship("NoteTypeLU", secondary=Notes)
work_order: Mapped["workOrders"] = relationship()
well: Mapped["Wells"] = relationship("Wells", primaryjoin='MeterActivities.location_id == Wells.location_id', foreign_keys='MeterActivities.location_id', viewonly=True)
photos: Mapped[List["MeterActivityPhotos"]] = relationship("MeterActivityPhotos", back_populates="meter_activity", cascade="all, delete")
well: Mapped["Wells"] = relationship(
"Wells",
primaryjoin="MeterActivities.location_id == Wells.location_id",
foreign_keys="MeterActivities.location_id",
viewonly=True,
)
photos: Mapped[List["MeterActivityPhotos"]] = relationship(
"MeterActivityPhotos", back_populates="meter_activity", cascade="all, delete"
)


class MeterActivityPhotos(Base):
__tablename__ = "MeterActivityPhotos"

id: Mapped[int] = mapped_column(Integer, primary_key=True, index=True, autoincrement=True)
id: Mapped[int] = mapped_column(
Integer, primary_key=True, index=True, autoincrement=True
)
meter_activity_id: Mapped[int] = mapped_column(
Integer, ForeignKey("MeterActivities.id", ondelete="CASCADE"), nullable=False
)
Expand All @@ -254,7 +264,7 @@ class MeterActivityPhotos(Base):
uploaded_at: Mapped[DateTime] = mapped_column(
DateTime(timezone=True), server_default=func.now()
)

original_file_name = Column(String, nullable=True)
meter_activity: Mapped["MeterActivities"] = relationship(
"MeterActivities", back_populates="photos"
)
Expand Down Expand Up @@ -488,6 +498,7 @@ class WellUseLU(Base):
code: Mapped[str] = mapped_column(String)
description: Mapped[str] = mapped_column(String)


class WaterSources(Base):
"""
The source of water for a well
Expand All @@ -497,6 +508,7 @@ class WaterSources(Base):
name: Mapped[str] = mapped_column(String, nullable=False)
description: Mapped[str] = mapped_column(String)


class WellStatus(Base):
"""
The status of a well
Expand Down Expand Up @@ -525,7 +537,9 @@ class Wells(Base):

use_type_id: Mapped[int] = mapped_column(Integer, ForeignKey("WellUseLU.id"))
location_id: Mapped[int] = mapped_column(Integer, ForeignKey("Locations.id"))
water_source_id: Mapped[int] = mapped_column(Integer, ForeignKey("water_sources.id"))
water_source_id: Mapped[int] = mapped_column(
Integer, ForeignKey("water_sources.id")
)
well_status_id: Mapped[int] = mapped_column(Integer, ForeignKey("well_status.id"))
chloride_group_id: Mapped[int] = mapped_column(Integer)

Expand Down Expand Up @@ -568,52 +582,67 @@ class WellMeasurements(Base):


class workOrderStatusLU(Base):
'''
"""
Models the status of a work order
'''
"""

__tablename__ = "work_order_status_lu"
name = mapped_column(String, nullable=False)
description = mapped_column(String, nullable=False)


class workOrders(Base):
'''
"""
Models work orders and associated information
'''
"""

__tablename__ = "work_orders"
date_created: Mapped[DateTime] = mapped_column(DateTime, nullable=False)
creator: Mapped[str] = mapped_column(String, nullable=True) # There is no consistent list of persons for this, so it is nullable
creator: Mapped[str] = mapped_column(
String, nullable=True
) # There is no consistent list of persons for this, so it is nullable
title: Mapped[str] = mapped_column(String, nullable=False)
description: Mapped[str] = mapped_column(String, nullable=True)
meter_id: Mapped[int] = mapped_column(Integer, ForeignKey("Meters.id"), nullable=False)
status_id: Mapped[int] = mapped_column(Integer, ForeignKey("work_order_status_lu.id"), nullable=False)
meter_id: Mapped[int] = mapped_column(
Integer, ForeignKey("Meters.id"), nullable=False
)
status_id: Mapped[int] = mapped_column(
Integer, ForeignKey("work_order_status_lu.id"), nullable=False
)
notes: Mapped[str] = mapped_column(String, nullable=True)
assigned_user_id: Mapped[int] = mapped_column(Integer, ForeignKey("Users.id"), nullable=True)
assigned_user_id: Mapped[int] = mapped_column(
Integer, ForeignKey("Users.id"), nullable=True
)
ose_request_id: Mapped[int] = mapped_column(Integer, nullable=True)

# Associated Activities
# associated_activities: Mapped[List['MeterActivities']] = relationship("MeterActivities")

meter: Mapped['Meters']= relationship()
status: Mapped['workOrderStatusLU']= relationship()
assigned_user: Mapped['Users'] = relationship()
meter: Mapped["Meters"] = relationship()
status: Mapped["workOrderStatusLU"] = relationship()
assigned_user: Mapped["Users"] = relationship()


class meterRegisters(Base):
'''
"""
Models the registers of a meter
'''
"""

__tablename__ = "meter_registers"
brand: Mapped[str] = mapped_column(String, nullable=False)
meter_size: Mapped[float] = mapped_column(Float, nullable=False)
part_id: Mapped[int] = mapped_column(Integer, ForeignKey("Parts.id"))
ratio: Mapped[str] = mapped_column(String)
dial_units_id: Mapped[int] = mapped_column(Integer, ForeignKey("Units.id"), nullable=False)
totalizer_units_id: Mapped[int] = mapped_column(Integer, ForeignKey("Units.id"), nullable=False)
dial_units_id: Mapped[int] = mapped_column(
Integer, ForeignKey("Units.id"), nullable=False
)
totalizer_units_id: Mapped[int] = mapped_column(
Integer, ForeignKey("Units.id"), nullable=False
)
number_of_digits: Mapped[int] = mapped_column(Integer, nullable=False)
decimal_digits: Mapped[int] = mapped_column(Integer)
multiplier: Mapped[float] = mapped_column(Float, nullable=False)
notes: Mapped[str] = mapped_column(String)

dial_units: Mapped['Units'] = relationship(foreign_keys=[dial_units_id])
totalizer_units: Mapped['Units'] = relationship(foreign_keys=[totalizer_units_id])


dial_units: Mapped["Units"] = relationship(foreign_keys=[dial_units_id])
totalizer_units: Mapped["Units"] = relationship(foreign_keys=[totalizer_units_id])
Loading