diff --git a/src/dutylog/application/bot/user_dialogs/admin_dialogs/residents_filter.py b/src/dutylog/application/bot/user_dialogs/admin_dialogs/residents_filter.py index c23fd93..be02718 100644 --- a/src/dutylog/application/bot/user_dialogs/admin_dialogs/residents_filter.py +++ b/src/dutylog/application/bot/user_dialogs/admin_dialogs/residents_filter.py @@ -78,8 +78,8 @@ async def get_filtered_results_data( rooms_repository: FromDishka[RoomsRepository], **kwargs, ): - filter_type = dialog_manager.dialog_data.get("filter_type", "") - filter_hours = dialog_manager.dialog_data.get("filter_hours") + filter_type: str = dialog_manager.dialog_data["filter_type"] + filter_hours: int = dialog_manager.dialog_data["filter_hours"] all_residents = await residents_repository.get_all_residents() @@ -91,16 +91,16 @@ async def get_filtered_results_data( filter_description = "свободным резидентам" elif filter_type == "hours_more": filtered = [r for r in all_residents if r.active_hours > filter_hours] - filter_description = f"неотработанных часов > {filter_hours}" + filter_description = f"неотработанным часам > {filter_hours}" elif filter_type == "hours_less": filtered = [r for r in all_residents if r.active_hours < filter_hours] - filter_description = f"неотработанных часов < {filter_hours}" + filter_description = f"неотработанным часам < {filter_hours}" elif filter_type == "worked_more": filtered = [r for r in all_residents if r.inactive_hours > filter_hours] - filter_description = f"отработанных часов > {filter_hours}" + filter_description = f"отработанным часам > {filter_hours}" elif filter_type == "worked_less": filtered = [r for r in all_residents if r.inactive_hours < filter_hours] - filter_description = f"отработанных часов < {filter_hours}" + filter_description = f"отработанным часам < {filter_hours}" else: filtered = all_residents filter_description = "всем резидентам"