forked from kodorvan/stcs
version 1 STCS
This commit is contained in:
@@ -12,12 +12,12 @@ from aiogram.fsm.state import State, StatesGroup
|
||||
router_main_settings = Router()
|
||||
|
||||
class update_main_settings(StatesGroup):
|
||||
trading_mode = State() # +
|
||||
size_leverage = State() #
|
||||
margin_type = State() #
|
||||
martingale_factor = State() #
|
||||
starting_quantity = State() #
|
||||
maximal_quantity = State() #
|
||||
trading_mode = State()
|
||||
size_leverage = State()
|
||||
margin_type = State()
|
||||
martingale_factor = State()
|
||||
starting_quantity = State()
|
||||
maximal_quantity = State()
|
||||
|
||||
async def reg_new_user_default_main_settings(id, message):
|
||||
tg_id = id
|
||||
@@ -31,18 +31,14 @@ async def reg_new_user_default_main_settings(id, message):
|
||||
async def main_settings_message(id, message, state):
|
||||
data = await rq.get_user_main_settings(id)
|
||||
|
||||
await message.answer(f"""<b>Основные настройки</b>
|
||||
Режим торговли: <b>{data['trading_mode']}</b>
|
||||
|
||||
Тип маржи: <b>{data['margin_type']}</b>
|
||||
|
||||
Размер кредитного плеча: <b>х{data['size_leverage']}</b>
|
||||
|
||||
Начальная ставка: <b>{data['starting_quantity']}</b>
|
||||
|
||||
Коэффициент мартингейла: <b>{data['martingale_factor']}</b>
|
||||
|
||||
Максимальное количесиво ставок в серии: <b>{data['maximal_quantity']}</b>
|
||||
await message.answer(f"""<b>Основные настройки</b>
|
||||
|
||||
<b>- Режим торговли:</b> {data['trading_mode']}
|
||||
<b>- Тип маржи:</b> {data['margin_type']}
|
||||
<b>- Размер кредитного плеча:</b> х{data['size_leverage']}
|
||||
<b>- Начальная ставка:</b> {data['starting_quantity']}
|
||||
<b>- Коэффициент мартингейла:</b> {data['martingale_factor']}
|
||||
<b>- Максимальное количесиво ставок в серии:</b> {data['maximal_quantity']}
|
||||
""", parse_mode='html', reply_markup=inline_markup.main_settings_markup)
|
||||
|
||||
async def trading_mode_message(message, state):
|
||||
@@ -66,7 +62,6 @@ async def state_trading_mode(callback: CallbackQuery, state):
|
||||
await callback.answer()
|
||||
|
||||
id = callback.from_user.id
|
||||
print(f"sdljfngdjklfg ## {callback.data}")
|
||||
|
||||
try:
|
||||
match callback.data:
|
||||
@@ -116,7 +111,7 @@ async def martingale_factor_message(message, state):
|
||||
await state.set_state(update_main_settings.martingale_factor)
|
||||
|
||||
await message.edit_text("Введите <b>коэффициент Мартингейла:</b>", parse_mode='html', reply_markup=inline_markup.back_btn_list_settings_markup)
|
||||
|
||||
|
||||
@router_main_settings.message(update_main_settings.martingale_factor)
|
||||
async def state_martingale_factor(message: Message, state):
|
||||
await state.update_data(martingale_factor = message.text)
|
||||
@@ -160,12 +155,12 @@ async def state_margin_type(callback: CallbackQuery, state):
|
||||
try:
|
||||
match callback.data:
|
||||
case 'margin_type_isolated':
|
||||
await rq.update_margin_type(id, 'Изолированный')
|
||||
await rq.update_margin_type(id, 'Isolated')
|
||||
await main_settings_message(id, callback.message, state)
|
||||
|
||||
await state.clear()
|
||||
case 'margin_type_cross':
|
||||
await rq.update_margin_type(id, 'Кросс')
|
||||
await rq.update_margin_type(id, 'Cross')
|
||||
await main_settings_message(id, callback.message, state)
|
||||
|
||||
await state.clear()
|
||||
@@ -183,7 +178,7 @@ async def state_starting_quantity(message: Message, state):
|
||||
|
||||
data = await state.get_data()
|
||||
|
||||
if data['starting_quantity'].isdigit() and int(data['starting_quantity']) <= 100:
|
||||
if data['starting_quantity'].isdigit():
|
||||
await rq.update_starting_quantity(message.from_user.id, data['starting_quantity'])
|
||||
await main_settings_message(message.from_user.id, message, state)
|
||||
|
||||
|
Reference in New Issue
Block a user