add disposal cost

main
MrWaradana 2 months ago
parent 69069aa56c
commit 4042cd442f

@ -39,6 +39,7 @@ class PlantTransactionData(Base, DefaultMixin, IdentityMixin):
cost_bd_total = Column(Float, nullable=True)
cost_bd_pv = Column(Float, nullable=True)
cost_bd_annualized = Column(Float, nullable=True)
cost_disposal_cost = Column(Float, nullable=True)
total_expense = Column(Float, nullable=True)
total_cost_eac = Column(Float, nullable=True)
total_profit_loss = Column(Float, nullable=True)

@ -28,7 +28,7 @@ async def get_transaction_datas(
search: Optional[str] = Query(None),
):
"""Get all transaction_data pagination."""
year_data = await get_all(
plant_transaction_data = await get_all(
db_session=db_session,
items_per_page=items_per_page,
search=search,
@ -36,7 +36,7 @@ async def get_transaction_datas(
)
# return
return StandardResponse(
data=year_data,
data=plant_transaction_data,
message="Data retrieved successfully",
)

@ -40,6 +40,7 @@ class PlantTransactionDataBase(DefaultBase):
cost_bd_total: Optional[float] = Field(None, nullable=True, ge=0, le=1_000_000_000_000_000)
cost_bd_pv: Optional[float] = Field(None, nullable=True, ge=0, le=1_000_000_000_000_000)
cost_bd_annualized: Optional[float] = Field(None, nullable=True, ge=0, le=1_000_000_000_000_000)
cost_disposal_cost: Optional[float] = Field(None, nullable=True, ge=0, le=1_000_000_000_000_000)
total_expense: Optional[float] = Field(None, nullable=True, ge=0, le=1_000_000_000_000_000)
total_cost_eac: Optional[float] = Field(None, nullable=True, ge=0, le=1_000_000_000_000_000)
total_profit_loss: Optional[float] = Field(None, nullable=True, ge=0, le=1_000_000_000_000_000)
@ -88,6 +89,7 @@ class PlantTransactionChart(DefaultBase):
chart_capex_biaya_investasi_tambahan: Optional[float] = Field(None, nullable=True, ge=0, le=1_000_000_000_000_000)
chart_capex_acquisition_cost: Optional[float] = Field(None, nullable=True, ge=0, le=1_000_000_000_000_000)
chart_capex_annualized: Optional[float] = Field(None, nullable=True, ge=0, le=1_000_000_000_000_000)
cost_disposal_cost: Optional[float] = Field(None, nullable=True, ge=0, le=1_000_000_000_000_000)
fs_chart_total_revenue: Optional[float] = Field(None, nullable=True, ge=0, le=1_000_000_000_000_000)
fs_chart_revenue_a: Optional[float] = Field(None, nullable=True, ge=0, le=1_000_000_000_000_000)
fs_chart_revenue_b: Optional[float] = Field(None, nullable=True, ge=0, le=1_000_000_000_000_000)

@ -70,6 +70,7 @@ async def get_charts(
item.chart_capex_annualized
+ item.chart_oem_annualized
+ item.chart_fuel_cost_annualized
+ item.cost_disposal_cost
)
revenue = item.chart_revenue_annualized
@ -109,7 +110,7 @@ async def get_charts(
previous_revenue = revenue
previous_year = item.tahun
return chart_data, bep_year, bep_total_lcc
return chart_data, int(bep_year) if bep_year is not None else None, bep_total_lcc
async def create(

Loading…
Cancel
Save