diff --git a/ft-app/app/models.py b/ft-app/app/models.py index d8b1018..0f00fb3 100644 --- a/ft-app/app/models.py +++ b/ft-app/app/models.py @@ -130,15 +130,15 @@ class Trade(Base): contract_code: Mapped[str] = mapped_column(String(10), index=True) direction: Mapped[str] = mapped_column(String(4)) open_date: Mapped[date] = mapped_column(Date) - open_price: Mapped[int] = mapped_column(Integer) - open_fee: Mapped[int | None] = mapped_column(Integer, nullable=True, default=0) + open_price: Mapped[float] = mapped_column(Float) + open_fee: Mapped[float | None] = mapped_column(Float, nullable=True, default=0) close_date: Mapped[date | None] = mapped_column(Date, nullable=True) - close_price: Mapped[int | None] = mapped_column(Integer, nullable=True) - close_fee: Mapped[int | None] = mapped_column(Integer, nullable=True, default=0) + close_price: Mapped[float | None] = mapped_column(Float, nullable=True) + close_fee: Mapped[float | None] = mapped_column(Float, nullable=True, default=0) status: Mapped[str] = mapped_column(String(10), default="open") @property - def pnl(self) -> int | None: + def pnl(self) -> float | None: if self.close_price is None: return None mul = 20 # glass futures point value diff --git a/ft-app/app/routers/trades.py b/ft-app/app/routers/trades.py index 73bce37..a175937 100644 --- a/ft-app/app/routers/trades.py +++ b/ft-app/app/routers/trades.py @@ -62,8 +62,8 @@ def open_trade( contract_code: str = Form(...), direction: str = Form(...), open_date: str = Form(...), - open_price: int = Form(...), - open_fee: int = Form(0), + open_price: float = Form(...), + open_fee: float = Form(0.0), db: Session = Depends(get_db), ): t = Trade( @@ -85,8 +85,8 @@ def close_trade( request: Request, trade_id: int, close_date: str = Form(...), - close_price: int = Form(...), - close_fee: int = Form(0), + close_price: float = Form(...), + close_fee: float = Form(0.0), db: Session = Depends(get_db), ): t = db.query(Trade).filter(Trade.id == trade_id).first() diff --git a/ft-app/app/templates/trades.html b/ft-app/app/templates/trades.html index 1315bf7..7164a9f 100644 --- a/ft-app/app/templates/trades.html +++ b/ft-app/app/templates/trades.html @@ -42,11 +42,11 @@
- +
- +
@@ -100,11 +100,11 @@
- +
- +