From f211df9c7df05a7ce625c1503ea87b635ecd4a60 Mon Sep 17 00:00:00 2001 From: Kseninia Mikhaylova Date: Mon, 22 Jul 2024 11:09:55 +0300 Subject: [PATCH] start msg --- back/tgbot/tgbot.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/back/tgbot/tgbot.py b/back/tgbot/tgbot.py index aac1c90..5c8ff64 100644 --- a/back/tgbot/tgbot.py +++ b/back/tgbot/tgbot.py @@ -130,9 +130,9 @@ class TgBot: await update.message.reply_markdown_v2( ( "Это бот для проведения инвентаризации\n" - "/ter \-\- список территорий" - "/my \-\- продолжить инвентаризацию\n" + "/ter \-\- список территорий\n" "/inv \-\- начать новую инвентаризацию\n" + "/my \-\- продолжить инвентаризацию\n" ), # reply_markup=ForceReply(selective=True), reply_parameters=ReplyParameters(message_id=update.message.message_id), @@ -207,6 +207,8 @@ class TgBot: await query.answer() context.chat_data.clear() + await self.start(update, context) + async def get_inv(self, update: Update, context: CallbackContext): query = update.callback_query await update.effective_message.edit_reply_markup(InlineKeyboardMarkup([])) @@ -215,7 +217,6 @@ class TgBot: inv_id = query.data.split("@")[-1] inv = await TgItem.objects.aget(id=inv_id) - context.chat_data["terdeep_value"] = inv.location_id context.chat_data["inv"] = inv.id context.chat_data["step"] = "name" @@ -421,10 +422,14 @@ class TgBot: if not context.chat_data.get("inv", None): current_ter_id = context.chat_data.get("terdeep_value", None) current_ter = await TerritoryItem.objects.aget(id=current_ter_id) - inv = await TgItem.objects.acreate(user_id=user.id, location=current_ter) + inv = await TgItem.objects.acreate( + user_id=user.id, location=current_ter + ) inv.name = update.message.text await inv.asave() - res = await update.effective_message.reply_text('Ок, сохранено', reply_markup=ReplyKeyboardRemove()) + res = await update.effective_message.reply_text( + "Ок, сохранено", reply_markup=ReplyKeyboardRemove() + ) await res.delete() else: inv = await TgItem.objects.aget(id=context.chat_data["inv"])