From 4c5f99856c9fdf4c8912d241107227448b0f9168 Mon Sep 17 00:00:00 2001 From: DevProject Agent Date: Sun, 14 Jun 2026 19:38:10 +0400 Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20time=5Fslots:=20emoji=20?= =?UTF-8?q?=D0=B7=D0=B0=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D1=8B=20=D0=BD=D0=B0?= =?UTF-8?q?=20=D1=82=D0=B5=D0=BA=D1=81=D1=82=D0=BE=D0=B2=D1=8B=D0=B5=20?= =?UTF-8?q?=D0=BC=D0=B5=D1=82=D0=BA=D0=B8=20[X]/[V]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Эмодзи нестабильно передаются через файловые каналы, заменены на ASCII - menu.py: эмодзи заменены на [текст] для совместимости --- app/keyboards/menu.py | 21 ++++++++------------- app/keyboards/time_slots.py | 9 +++++---- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/app/keyboards/menu.py b/app/keyboards/menu.py index 66debc4..aee84c4 100644 --- a/app/keyboards/menu.py +++ b/app/keyboards/menu.py @@ -1,25 +1,20 @@ from aiogram.types import ReplyKeyboardMarkup, KeyboardButton -# Главное меню menu = ReplyKeyboardMarkup( keyboard=[ - [KeyboardButton(text="📅 Записаться")], - [ - KeyboardButton(text="👤 Профиль"), - KeyboardButton(text="📖 Мои записи") - ], - [ - KeyboardButton(text="ℹ️ О компании"), - KeyboardButton(text="📞 Контакты") - ] + [KeyboardButton(text="/start")], + [KeyboardButton(text="[services]")], + [KeyboardButton(text="[book]")], + [KeyboardButton(text="[mybookings]")], + [KeyboardButton(text="[contacts]")], + [KeyboardButton(text="[about]")], ], resize_keyboard=True ) -# Меню во время записи cancel_menu = ReplyKeyboardMarkup( keyboard=[ - [KeyboardButton(text="Отмена")] + [KeyboardButton(text="cancel")] ], resize_keyboard=True -) \ No newline at end of file +) diff --git a/app/keyboards/time_slots.py b/app/keyboards/time_slots.py index f5d5697..c7df3a0 100644 --- a/app/keyboards/time_slots.py +++ b/app/keyboards/time_slots.py @@ -6,11 +6,12 @@ def get_time_keyboard(busy_times): buttons = [] row = [] for slot in TIME_SLOTS: - if slot in busy_times: - label = f❌ {slot} + busy = slot in busy_times + if busy: + label = "[X] " + slot else: - label = f✅ {slot} - row.append(InlineKeyboardButton(text=label, callback_data=ftime_{slot})) + label = "[V] " + slot + row.append(InlineKeyboardButton(text=label, callback_data="time_" + slot)) if len(row) == 3: buttons.append(row) row = []