refactor: year data & model

main
MrWaradana 1 year ago
parent bf50a26605
commit 1e030b29a7

@ -1,4 +1,4 @@
from sqlalchemy import Column, Float, Integer, String, ForeignKey from sqlalchemy import Column, Float, Integer, String, ForeignKey, Text
from sqlalchemy.orm import relationship from sqlalchemy.orm import relationship
from src.database.core import Base from src.database.core import Base
from src.models import DefaultMixin, IdentityMixin from src.models import DefaultMixin, IdentityMixin
@ -14,6 +14,9 @@ class Equipment(Base, DefaultMixin, IdentityMixin):
design_life = Column(Integer, nullable=False) design_life = Column(Integer, nullable=False)
forecasting_target_year = Column(Integer, nullable=False) forecasting_target_year = Column(Integer, nullable=False)
manhours_rate = Column(Float, nullable=False) manhours_rate = Column(Float, nullable=False)
min_eac_info = Column(Text, nullable=True)
harga_saat_ini = Column(Float, nullable=True)
class MasterRecords(Base, DefaultMixin, IdentityMixin): class MasterRecords(Base, DefaultMixin, IdentityMixin):
__tablename__ = "lcc_tr_data" __tablename__ = "lcc_tr_data"

@ -23,7 +23,7 @@ async def get_all(
common, common,
): ):
"""Returns all documents.""" """Returns all documents."""
query = Select(Yeardata) query = Select(Yeardata).order_by(Yeardata.year.desc())
if search: if search:
query = query.filter(cast(Yeardata.year, String).ilike(f"%{search}%")) query = query.filter(cast(Yeardata.year, String).ilike(f"%{search}%"))

Loading…
Cancel
Save