Добавлена ветка cosmetics
This commit is contained in:
+16
-28
@@ -21,36 +21,24 @@ async def my_bookings(message: Message):
|
||||
logger.debug("Found {n} bookings", n=len(bookings))
|
||||
|
||||
if not bookings:
|
||||
await message.answer("У вас нет активных записей")
|
||||
await message.answer("\u0423 \u0432\u0430\u0441 \u043d\u0435\u0442 \u0430\u043a\u0442\u0438\u0432\u043d\u044b\u0445 \u0437\u0430\u043f\u0438\u0441\u0435\u0439")
|
||||
return
|
||||
|
||||
# Group all bookings into one message
|
||||
lines = []
|
||||
for b in bookings:
|
||||
bid = b["id"]
|
||||
svc = b["service"]
|
||||
mst = b["master"]
|
||||
dat = b["date"]
|
||||
tim = b["time"]
|
||||
lines.append(
|
||||
f"#{bid} \U0001f486 {svc}\n"
|
||||
f"\U0001f464 {mst}\n"
|
||||
f"\U0001f4c5 {dat}\U0001f552 {tim}"
|
||||
for booking in bookings:
|
||||
svc = booking["service"]
|
||||
mst = booking["master"]
|
||||
dat = booking["date"]
|
||||
tim = booking["time"]
|
||||
text = (
|
||||
"\U0001f486 " + svc + "\n"
|
||||
"\U0001f464 " + mst + "\n"
|
||||
"\U0001f4c5 " + dat + "\n"
|
||||
"\U0001f552 " + tim
|
||||
)
|
||||
|
||||
full_text = "\u0423 \u0432\u0430\u0441 " + str(len(bookings)) + " \u0437\u0430\u043f\u0438\u0441\u0438:\n\n" + "\n\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\n".join(lines)
|
||||
await message.answer(full_text)
|
||||
|
||||
# Send action buttons for each booking
|
||||
for b in bookings:
|
||||
await message.answer(
|
||||
f"#{b['id']}: {b['service']}",
|
||||
reply_markup=get_booking_actions(b["id"])
|
||||
)
|
||||
|
||||
await message.answer(text, reply_markup=get_booking_actions(booking["id"]))
|
||||
except Exception as e:
|
||||
logger.exception("Error in my_bookings: {error}", error=e)
|
||||
await message.answer("Произошла ошибка. Попробуйте позже.")
|
||||
await message.answer("\u041f\u0440\u043e\u0438\u0437\u043e\u0448\u043b\u0430 \u043e\u0448\u0438\u0431\u043a\u0430. \u041f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u043f\u043e\u0437\u0436\u0435.")
|
||||
|
||||
|
||||
@router.callback_query(F.data.startswith("cancel_booking_"))
|
||||
@@ -58,7 +46,7 @@ async def cancel_booking_handler(callback: CallbackQuery):
|
||||
booking_id = int(callback.data.split("_")[2])
|
||||
logger.info("User {uid} cancelled booking #{bid}", uid=callback.from_user.id, bid=booking_id)
|
||||
await cancel_booking(booking_id)
|
||||
await callback.message.edit_text("\u2705 Запись отменена")
|
||||
await callback.message.edit_text("\u2705 \u0417\u0430\u043f\u0438\u0441\u044c \u043e\u0442\u043c\u0435\u043d\u0435\u043d\u0430")
|
||||
await callback.answer()
|
||||
|
||||
|
||||
@@ -75,7 +63,7 @@ async def edit_booking_handler(callback: CallbackQuery, state: FSMContext):
|
||||
booking = next((b for b in bookings if b["id"] == booking_id), None)
|
||||
|
||||
if not booking:
|
||||
await callback.message.edit_text("Запись не найдена")
|
||||
await callback.message.edit_text("\u0417\u0430\u043f\u0438\u0441\u044c \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u0430")
|
||||
await callback.answer()
|
||||
return
|
||||
|
||||
@@ -89,7 +77,7 @@ async def edit_booking_handler(callback: CallbackQuery, state: FSMContext):
|
||||
|
||||
await state.set_state(BookingState.service)
|
||||
await callback.message.edit_text(
|
||||
"\u270f\ufe0f Редактирование записи #" + str(booking_id) + "\n\nВыберите новую услугу:",
|
||||
"\u270f\ufe0f \u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 \u0437\u0430\u043f\u0438\u0441\u0438 #" + str(booking_id) + "\n\n\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u043d\u043e\u0432\u0443\u044e \u0443\u0441\u043b\u0443\u0433\u0443:",
|
||||
reply_markup=get_services_keyboard()
|
||||
)
|
||||
await callback.answer()
|
||||
|
||||
Reference in New Issue
Block a user