diff --git a/back/tgbot/tgbot.py b/back/tgbot/tgbot.py index a8a62ce..8a688d5 100644 --- a/back/tgbot/tgbot.py +++ b/back/tgbot/tgbot.py @@ -69,7 +69,7 @@ class TgBot: text = await TgBot.app.bot.get_file(item.text) TgBotUpdater.return_values[item.text] = text.file_path except Exception as e: - TgBotUpdater.return_values[item.text] = 'error' + TgBotUpdater.return_values[item.text] = None async def set_handlers(self): TgBot.app.add_handler( @@ -187,7 +187,7 @@ class TgBot: f"Step {current_step} from user {user.full_name} in {update.message}" ) - if not current_step and update.message.text == "/inv": + if update.effective_message.text == "/inv": context.chat_data["step"] = "name" await update.effective_message.reply_markdown_v2( ( @@ -311,7 +311,6 @@ class TgBot: await element.asave() empty_fields = await tmc_element.field.filter(text=None).acount() - logger.info(empty_fields) if empty_fields > 0: context.chat_data["step"] = "add_tmc" await self.inv(update, context) diff --git a/front/assets/main.scss b/front/assets/main.scss index 0571e86..45694b7 100644 --- a/front/assets/main.scss +++ b/front/assets/main.scss @@ -49,7 +49,7 @@ dd { @apply col-span-full col-start-2; &:last-of-type { - @apply mb-2 + @apply mb-2 } } diff --git a/front/pages/table/index.vue b/front/pages/table/index.vue index 2176920..8827df0 100644 --- a/front/pages/table/index.vue +++ b/front/pages/table/index.vue @@ -30,7 +30,7 @@ const columns = [

Проведенные инвентаризации

- +