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

Fixed

Browse Source
This commit is contained in:
algizn97
2025-10-03 14:19:18 +05:00
parent 4adbd70948
commit 1508629727
15 changed files with 412 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
app/telegram/keyboards/inline.py
View File

@@ -39,7 +39,7 @@ main_menu = InlineKeyboardMarkup(
[InlineKeyboardButton(text="Начать торговлю", callback_data="start_trading")],
[
InlineKeyboardButton(
text="Остановить торговлю", callback_data="stop_trading"
text="Остановить торговлю", callback_data="trading_stop"
)
],
]
@@ -327,58 +327,57 @@ change_position = InlineKeyboardMarkup(
)
def create_active_positions_keyboard(symbols):
def create_active_positions_keyboard(symbols: list):
builder = InlineKeyboardBuilder()
for sym in symbols:
builder.button(text=f"{sym}", callback_data=f"get_position_{sym}")
for sym, side in symbols:
builder.button(text=f"{sym}:{side}", callback_data=f"get_position_{sym}_{side}")
builder.button(text="Назад", callback_data="my_deals")
builder.button(text="На главную", callback_data="profile_bybit")
builder.adjust(2)
return builder.as_markup()
def make_close_position_keyboard(symbol_pos: str):
def make_close_position_keyboard(symbol_pos: str, side: str, position_idx: int, qty: int):
return InlineKeyboardMarkup(
inline_keyboard=[
[
InlineKeyboardButton(
text="Закрыть позицию", callback_data=f"close_position_{symbol_pos}"
text="Закрыть позицию", callback_data=f"close_position_{symbol_pos}_{side}_{position_idx}_{qty}"
)
],
[
InlineKeyboardButton(
text="Установить TP/SL", callback_data=f"pos_tp_sl_{symbol_pos}"
text="Установить TP/SL", callback_data=f"pos_tp_sl_{symbol_pos}_{position_idx}"
)
],
[
InlineKeyboardButton(text="Назад", callback_data="my_deals"),
InlineKeyboardButton(text="Назад", callback_data="change_position"),
InlineKeyboardButton(text="На главную", callback_data="profile_bybit"),
],
]
)
def create_active_orders_keyboard(orders):
def create_active_orders_keyboard(orders:list):
builder = InlineKeyboardBuilder()
for order in orders:
builder.button(text=f"{order}", callback_data=f"get_order_{order}")
builder.button(text="Закрыть все ордера", callback_data="cancel_all_orders")
for order, side in orders:
builder.button(text=f"{order}", callback_data=f"get_order_{order}_{side}")
builder.button(text="Назад", callback_data="my_deals")
builder.button(text="На главную", callback_data="profile_bybit")
builder.adjust(2)
return builder.as_markup()
def make_close_orders_keyboard(symbol_order: str):
def make_close_orders_keyboard(symbol_order: str, order_id: str):
return InlineKeyboardMarkup(
inline_keyboard=[
[
InlineKeyboardButton(
text="Закрыть ордер", callback_data=f"close_order_{symbol_order}"
text="Закрыть ордер", callback_data=f"close_order_{symbol_order}_{order_id}"
)
],
[
InlineKeyboardButton(text="Назад", callback_data="my_deals"),
InlineKeyboardButton(text="Назад", callback_data="open_orders"),
InlineKeyboardButton(text="На главную", callback_data="profile_bybit"),
],
]
@@ -438,12 +437,31 @@ back_to_start_trading = InlineKeyboardMarkup(
]
)
cancel_timer = InlineKeyboardMarkup(
cancel_timer_merged = InlineKeyboardMarkup(
inline_keyboard=[
[InlineKeyboardButton(text="Отменить таймер", callback_data="cancel_timer")],
[InlineKeyboardButton(text="Отменить таймер", callback_data="cancel_timer_merged")],
[
InlineKeyboardButton(text="Назад", callback_data="conditions"),
InlineKeyboardButton(text="На главную", callback_data="profile_bybit"),
],
]
)
cancel_timer_switch = InlineKeyboardMarkup(
inline_keyboard=[
[InlineKeyboardButton(text="Отменить таймер", callback_data="cancel_timer_switch")],
[
InlineKeyboardButton(text="На главную", callback_data="profile_bybit"),
],
]
)
# STOP TRADING
cancel_timer_stop = InlineKeyboardMarkup(
inline_keyboard=[
[InlineKeyboardButton(text="Отменить таймер", callback_data="cancel_timer_stop")],
[
InlineKeyboardButton(text="На главную", callback_data="profile_bybit"),
],
]
)