Compare commits
No commits in common. "987f3e660946b12091960cc448f67bbf8c37c082" and "acc3d50f287aa3a0c5fbb809dfeda2bfbde4a749" have entirely different histories.
987f3e6609
...
acc3d50f28
|
|
@ -1,37 +1,9 @@
|
|||
# Python
|
||||
__pycache__/
|
||||
*.py[cod]
|
||||
*.pyo
|
||||
*.egg-info/
|
||||
dist/
|
||||
build/
|
||||
*.egg
|
||||
|
||||
# Virtual environment
|
||||
.venv/
|
||||
venv/
|
||||
env/
|
||||
|
||||
# Environment variables
|
||||
.env
|
||||
|
||||
# Database
|
||||
data/
|
||||
*.db
|
||||
|
||||
# IDE
|
||||
.idea/
|
||||
.vscode/
|
||||
*.swp
|
||||
*.swo
|
||||
|
||||
# OS
|
||||
.DS_Store
|
||||
Thumbs.db
|
||||
|
||||
# Project docs (local only)
|
||||
CLAUDE.md
|
||||
TZ.md
|
||||
|
||||
# Claude Code
|
||||
.claude/
|
||||
TZ.md
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -122,7 +122,7 @@ async def show_reminder_details(
|
|||
|
||||
await callback.message.edit_text(
|
||||
details_text,
|
||||
reply_markup=get_reminder_details_keyboard(reminder.id, reminder.is_active, page=callback_data.page),
|
||||
reply_markup=get_reminder_details_keyboard(reminder.id, reminder.is_active),
|
||||
parse_mode="HTML",
|
||||
)
|
||||
await callback.answer()
|
||||
|
|
@ -131,7 +131,6 @@ async def show_reminder_details(
|
|||
@router.callback_query(ReminderActionCallback.filter(F.action == "back_to_list"))
|
||||
async def back_to_reminders_list(
|
||||
callback: CallbackQuery,
|
||||
callback_data: ReminderActionCallback,
|
||||
session: AsyncSession,
|
||||
) -> None:
|
||||
"""
|
||||
|
|
@ -154,7 +153,7 @@ async def back_to_reminders_list(
|
|||
|
||||
await callback.message.edit_text(
|
||||
f"📋 Твои напоминания ({len(reminders)}):",
|
||||
reply_markup=get_reminders_list_keyboard(reminders, page=callback_data.page),
|
||||
reply_markup=get_reminders_list_keyboard(reminders, page=0),
|
||||
)
|
||||
await callback.answer()
|
||||
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -15,9 +15,8 @@ class ReminderIntervalCallback(CallbackData, prefix="interval"):
|
|||
|
||||
class ReminderActionCallback(CallbackData, prefix="reminder"):
|
||||
"""Callback for reminder actions."""
|
||||
action: str # done, snooze, pause, resume, delete, details, edit, back_to_list
|
||||
action: str # done, snooze, pause, resume, delete, details, edit
|
||||
reminder_id: int
|
||||
page: int = 0
|
||||
|
||||
|
||||
class ReminderEditCallback(CallbackData, prefix="edit"):
|
||||
|
|
@ -171,7 +170,7 @@ def get_snooze_delay_keyboard(reminder_id: int) -> InlineKeyboardMarkup:
|
|||
return keyboard
|
||||
|
||||
|
||||
def get_reminder_details_keyboard(reminder_id: int, is_active: bool, page: int = 0) -> InlineKeyboardMarkup:
|
||||
def get_reminder_details_keyboard(reminder_id: int, is_active: bool) -> InlineKeyboardMarkup:
|
||||
"""
|
||||
Get keyboard for reminder details view.
|
||||
|
||||
|
|
@ -208,7 +207,7 @@ def get_reminder_details_keyboard(reminder_id: int, is_active: bool, page: int =
|
|||
[
|
||||
InlineKeyboardButton(
|
||||
text="⬅️ Назад к списку",
|
||||
callback_data=ReminderActionCallback(action="back_to_list", reminder_id=0, page=page).pack()
|
||||
callback_data=ReminderActionCallback(action="back_to_list", reminder_id=0).pack()
|
||||
),
|
||||
],
|
||||
]
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue