mirror of
https://github.com/koloideal/DutyLog.git
synced 2026-08-08 18:11:14 +03:00
fix empty message text in detail windows for media groups; add emoji to add room hours button
This commit is contained in:
@@ -1142,7 +1142,7 @@ resident_history_window = Window(
|
|||||||
|
|
||||||
resident_history_detail_window = Window(
|
resident_history_detail_window = Window(
|
||||||
DynamicMedia("photo_media"),
|
DynamicMedia("photo_media"),
|
||||||
Format("{detail_content}"),
|
Format("{detail_content}", when=F["detail_content"]),
|
||||||
SwitchTo(
|
SwitchTo(
|
||||||
Const("◀️ К списку"),
|
Const("◀️ К списку"),
|
||||||
id="back_to_history_from_detail",
|
id="back_to_history_from_detail",
|
||||||
|
|||||||
@@ -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.input import MessageInput
|
||||||
from aiogram_dialog.widgets.media import DynamicMedia
|
from aiogram_dialog.widgets.media import DynamicMedia
|
||||||
from aiogram_dialog.api.entities.media import MediaAttachment, MediaId
|
from aiogram_dialog.api.entities.media import MediaAttachment, MediaId
|
||||||
|
from magic_filter import F
|
||||||
from dishka import FromDishka
|
from dishka import FromDishka
|
||||||
from dishka.integrations.aiogram_dialog import inject
|
from dishka.integrations.aiogram_dialog import inject
|
||||||
|
|
||||||
@@ -655,7 +656,7 @@ rooms_list_window = Window(
|
|||||||
room_info_window = Window(
|
room_info_window = Window(
|
||||||
Format("{info_content}"),
|
Format("{info_content}"),
|
||||||
Button(
|
Button(
|
||||||
Const("Добавить часы"),
|
Const("➕ Добавить часы"),
|
||||||
id="room_add_hours_btn",
|
id="room_add_hours_btn",
|
||||||
on_click=on_room_add_hours_click,
|
on_click=on_room_add_hours_click,
|
||||||
),
|
),
|
||||||
@@ -843,7 +844,7 @@ room_history_window = Window(
|
|||||||
|
|
||||||
room_history_detail_window = Window(
|
room_history_detail_window = Window(
|
||||||
DynamicMedia("photo_media"),
|
DynamicMedia("photo_media"),
|
||||||
Format("{detail_content}"),
|
Format("{detail_content}", when=F["detail_content"]),
|
||||||
SwitchTo(
|
SwitchTo(
|
||||||
Const("◀️ К списку"),
|
Const("◀️ К списку"),
|
||||||
id="back_to_room_history_from_detail",
|
id="back_to_room_history_from_detail",
|
||||||
|
|||||||
@@ -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.kbd import SwitchTo, ScrollingGroup, Select, Button
|
||||||
from aiogram_dialog.widgets.media import DynamicMedia
|
from aiogram_dialog.widgets.media import DynamicMedia
|
||||||
from aiogram_dialog.api.entities.media import MediaAttachment, MediaId
|
from aiogram_dialog.api.entities.media import MediaAttachment, MediaId
|
||||||
|
from magic_filter import F
|
||||||
from dishka import FromDishka
|
from dishka import FromDishka
|
||||||
from dishka.integrations.aiogram_dialog import inject
|
from dishka.integrations.aiogram_dialog import inject
|
||||||
|
|
||||||
@@ -207,7 +208,7 @@ transactions_history_window = Window(
|
|||||||
|
|
||||||
transactions_history_detail_window = Window(
|
transactions_history_detail_window = Window(
|
||||||
DynamicMedia("photo_media"),
|
DynamicMedia("photo_media"),
|
||||||
Format("{detail_content}"),
|
Format("{detail_content}", when=F["detail_content"]),
|
||||||
SwitchTo(
|
SwitchTo(
|
||||||
Const("◀️ К списку"),
|
Const("◀️ К списку"),
|
||||||
id="back_to_transactions_from_detail",
|
id="back_to_transactions_from_detail",
|
||||||
|
|||||||
@@ -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.kbd import Back, ScrollingGroup, Select, SwitchTo, Button
|
||||||
from aiogram_dialog.widgets.media import DynamicMedia
|
from aiogram_dialog.widgets.media import DynamicMedia
|
||||||
from aiogram_dialog.api.entities.media import MediaAttachment, MediaId
|
from aiogram_dialog.api.entities.media import MediaAttachment, MediaId
|
||||||
|
from magic_filter import F
|
||||||
from dishka import FromDishka
|
from dishka import FromDishka
|
||||||
from dishka.integrations.aiogram_dialog import inject
|
from dishka.integrations.aiogram_dialog import inject
|
||||||
|
|
||||||
@@ -184,7 +185,7 @@ history_window = Window(
|
|||||||
|
|
||||||
history_detail_window = Window(
|
history_detail_window = Window(
|
||||||
DynamicMedia("photo_media"),
|
DynamicMedia("photo_media"),
|
||||||
Format("{detail_content}"),
|
Format("{detail_content}", when=F["detail_content"]),
|
||||||
SwitchTo(
|
SwitchTo(
|
||||||
Const("◀️ К списку"),
|
Const("◀️ К списку"),
|
||||||
id="back_to_history_from_detail",
|
id="back_to_history_from_detail",
|
||||||
|
|||||||
Reference in New Issue
Block a user