start msg

This commit is contained in:
Kseninia Mikhaylova 2024-07-22 11:09:55 +03:00
parent 8691855301
commit f211df9c7d
1 changed files with 10 additions and 5 deletions

View File

@ -130,9 +130,9 @@ class TgBot:
await update.message.reply_markdown_v2( await update.message.reply_markdown_v2(
( (
"Это бот для проведения инвентаризации\n" "Это бот для проведения инвентаризации\n"
"/ter \-\- список территорий" "/ter \-\- список территорий\n"
"/my \-\- продолжить инвентаризацию\n"
"/inv \-\- начать новую инвентаризацию\n" "/inv \-\- начать новую инвентаризацию\n"
"/my \-\- продолжить инвентаризацию\n"
), ),
# reply_markup=ForceReply(selective=True), # reply_markup=ForceReply(selective=True),
reply_parameters=ReplyParameters(message_id=update.message.message_id), reply_parameters=ReplyParameters(message_id=update.message.message_id),
@ -207,6 +207,8 @@ class TgBot:
await query.answer() await query.answer()
context.chat_data.clear() context.chat_data.clear()
await self.start(update, context)
async def get_inv(self, update: Update, context: CallbackContext): async def get_inv(self, update: Update, context: CallbackContext):
query = update.callback_query query = update.callback_query
await update.effective_message.edit_reply_markup(InlineKeyboardMarkup([])) await update.effective_message.edit_reply_markup(InlineKeyboardMarkup([]))
@ -215,7 +217,6 @@ class TgBot:
inv_id = query.data.split("@")[-1] inv_id = query.data.split("@")[-1]
inv = await TgItem.objects.aget(id=inv_id) inv = await TgItem.objects.aget(id=inv_id)
context.chat_data["terdeep_value"] = inv.location_id context.chat_data["terdeep_value"] = inv.location_id
context.chat_data["inv"] = inv.id context.chat_data["inv"] = inv.id
context.chat_data["step"] = "name" context.chat_data["step"] = "name"
@ -421,10 +422,14 @@ class TgBot:
if not context.chat_data.get("inv", None): if not context.chat_data.get("inv", None):
current_ter_id = context.chat_data.get("terdeep_value", None) current_ter_id = context.chat_data.get("terdeep_value", None)
current_ter = await TerritoryItem.objects.aget(id=current_ter_id) 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 inv.name = update.message.text
await inv.asave() 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() await res.delete()
else: else:
inv = await TgItem.objects.aget(id=context.chat_data["inv"]) inv = await TgItem.objects.aget(id=context.chat_data["inv"])