From d8e6cead6ed9e6203aa8b164ee3715b168c3ef1a Mon Sep 17 00:00:00 2001 From: kolo Date: Wed, 15 Jul 2026 01:21:57 +0300 Subject: [PATCH] fix empty message text in detail windows for media groups; add emoji to add room hours button --- .../application/bot/admin_dialogs/residents_management.py | 2 +- .../application/bot/admin_dialogs/rooms_management.py | 5 +++-- .../application/bot/creator_dialogs/transactions_history.py | 3 ++- .../application/bot/user_dialogs/user_menu/history.py | 3 ++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/dutylog/application/bot/admin_dialogs/residents_management.py b/src/dutylog/application/bot/admin_dialogs/residents_management.py index 35598f4..13e5cf3 100644 --- a/src/dutylog/application/bot/admin_dialogs/residents_management.py +++ b/src/dutylog/application/bot/admin_dialogs/residents_management.py @@ -1142,7 +1142,7 @@ resident_history_window = Window( resident_history_detail_window = Window( DynamicMedia("photo_media"), - Format("{detail_content}"), + Format("{detail_content}", when=F["detail_content"]), SwitchTo( Const("◀️ К списку"), id="back_to_history_from_detail", diff --git a/src/dutylog/application/bot/admin_dialogs/rooms_management.py b/src/dutylog/application/bot/admin_dialogs/rooms_management.py index 86224d7..cf9ae96 100644 --- a/src/dutylog/application/bot/admin_dialogs/rooms_management.py +++ b/src/dutylog/application/bot/admin_dialogs/rooms_management.py @@ -10,6 +10,7 @@ from aiogram_dialog.widgets.kbd import SwitchTo, Button, ScrollingGroup, Select, from aiogram_dialog.widgets.input import MessageInput from aiogram_dialog.widgets.media import DynamicMedia from aiogram_dialog.api.entities.media import MediaAttachment, MediaId +from magic_filter import F from dishka import FromDishka from dishka.integrations.aiogram_dialog import inject @@ -655,7 +656,7 @@ rooms_list_window = Window( room_info_window = Window( Format("{info_content}"), Button( - Const("Добавить часы"), + Const("➕ Добавить часы"), id="room_add_hours_btn", on_click=on_room_add_hours_click, ), @@ -843,7 +844,7 @@ room_history_window = Window( room_history_detail_window = Window( DynamicMedia("photo_media"), - Format("{detail_content}"), + Format("{detail_content}", when=F["detail_content"]), SwitchTo( Const("◀️ К списку"), id="back_to_room_history_from_detail", diff --git a/src/dutylog/application/bot/creator_dialogs/transactions_history.py b/src/dutylog/application/bot/creator_dialogs/transactions_history.py index 106b4d6..f743cf0 100644 --- a/src/dutylog/application/bot/creator_dialogs/transactions_history.py +++ b/src/dutylog/application/bot/creator_dialogs/transactions_history.py @@ -6,6 +6,7 @@ from aiogram_dialog.widgets.text import Format, Const from aiogram_dialog.widgets.kbd import SwitchTo, ScrollingGroup, Select, Button from aiogram_dialog.widgets.media import DynamicMedia from aiogram_dialog.api.entities.media import MediaAttachment, MediaId +from magic_filter import F from dishka import FromDishka from dishka.integrations.aiogram_dialog import inject @@ -207,7 +208,7 @@ transactions_history_window = Window( transactions_history_detail_window = Window( DynamicMedia("photo_media"), - Format("{detail_content}"), + Format("{detail_content}", when=F["detail_content"]), SwitchTo( Const("◀️ К списку"), id="back_to_transactions_from_detail", diff --git a/src/dutylog/application/bot/user_dialogs/user_menu/history.py b/src/dutylog/application/bot/user_dialogs/user_menu/history.py index 8caf911..e6ec31e 100644 --- a/src/dutylog/application/bot/user_dialogs/user_menu/history.py +++ b/src/dutylog/application/bot/user_dialogs/user_menu/history.py @@ -6,6 +6,7 @@ from aiogram_dialog.widgets.text import Format, Const from aiogram_dialog.widgets.kbd import Back, ScrollingGroup, Select, SwitchTo, Button from aiogram_dialog.widgets.media import DynamicMedia from aiogram_dialog.api.entities.media import MediaAttachment, MediaId +from magic_filter import F from dishka import FromDishka from dishka.integrations.aiogram_dialog import inject @@ -184,7 +185,7 @@ history_window = Window( history_detail_window = Window( DynamicMedia("photo_media"), - Format("{detail_content}"), + Format("{detail_content}", when=F["detail_content"]), SwitchTo( Const("◀️ К списку"), id="back_to_history_from_detail",