Merge remote-tracking branch 'origin/cards'

This commit is contained in:
2025-03-11 22:38:50 +03:00
72 changed files with 4534 additions and 3286 deletions

View File

@@ -10,7 +10,7 @@ from models.work_shifts import WorkShift
if TYPE_CHECKING:
from models.payroll import PayRate, PaymentRecord
from models import Deal, DealEmployees
from models import Card, CardEmployees
role_permissions = Table(
'role_permissions',
@@ -115,7 +115,7 @@ class User(BaseModel):
foreign_keys="WorkShift.user_id"
)
managed_deals: Mapped[list["Deal"]] = relationship(
managed_cards: Mapped[list["Card"]] = relationship(
back_populates="manager",
uselist=True,
)
@@ -127,7 +127,7 @@ class User(BaseModel):
cascade="all, delete-orphan"
)
deals: Mapped[list['DealEmployees']] = relationship(
cards: Mapped[list['CardEmployees']] = relationship(
back_populates='user',
lazy='selectin'
)