kodorvan/stcs
6
0
Fork 2
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

develop #3

Open
Alex wants to merge 77 commits from Alex/stcs:develop into stable
pull from: Alex/stcs:develop
merge into: kodorvan:stable
Conversation 0 Commits 77 Files Changed 40 +121 -28
5 changed files with 121 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7f53caaac6 - Show all commits

3
app/telegram/database/models.py
View File

@@ -74,6 +74,8 @@ class User_Main_Settings(Base):
starting_quantity = mapped_column(Integer(), default=1) starting_quantity = mapped_column(Integer(), default=1)
martingale_factor = mapped_column(Integer(), default=1) martingale_factor = mapped_column(Integer(), default=1)
maximal_quantity = mapped_column(Integer(), default=10) maximal_quantity = mapped_column(Integer(), default=10)
entry_order_type = mapped_column(String(10), default='Market')
class User_Risk_Management_Settings(Base): class User_Risk_Management_Settings(Base):
__tablename__ = 'user_risk_management_settings' __tablename__ = 'user_risk_management_settings'
@@ -85,6 +87,7 @@ class User_Risk_Management_Settings(Base):
price_profit = mapped_column(Integer(), default=1) price_profit = mapped_column(Integer(), default=1)
price_loss = mapped_column(Integer(), default=1) price_loss = mapped_column(Integer(), default=1)
max_risk_deal = mapped_column(Integer(), default=100) max_risk_deal = mapped_column(Integer(), default=100)
commission_fee = mapped_column(Integer(), default=0)
class User_Condition_Settings(Base): class User_Condition_Settings(Base):
__tablename__ = 'user_condition_settings' __tablename__ = 'user_condition_settings'