mirror of
https://github.com/koloideal/DutyLog.git
synced 2026-06-10 10:25:29 +03:00
update
This commit is contained in:
@@ -78,8 +78,8 @@ async def get_filtered_results_data(
|
|||||||
rooms_repository: FromDishka[RoomsRepository],
|
rooms_repository: FromDishka[RoomsRepository],
|
||||||
**kwargs,
|
**kwargs,
|
||||||
):
|
):
|
||||||
filter_type = dialog_manager.dialog_data.get("filter_type", "")
|
filter_type: str = dialog_manager.dialog_data["filter_type"]
|
||||||
filter_hours = dialog_manager.dialog_data.get("filter_hours")
|
filter_hours: int = dialog_manager.dialog_data["filter_hours"]
|
||||||
|
|
||||||
all_residents = await residents_repository.get_all_residents()
|
all_residents = await residents_repository.get_all_residents()
|
||||||
|
|
||||||
@@ -91,16 +91,16 @@ async def get_filtered_results_data(
|
|||||||
filter_description = "свободным резидентам"
|
filter_description = "свободным резидентам"
|
||||||
elif filter_type == "hours_more":
|
elif filter_type == "hours_more":
|
||||||
filtered = [r for r in all_residents if r.active_hours > filter_hours]
|
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":
|
elif filter_type == "hours_less":
|
||||||
filtered = [r for r in all_residents if r.active_hours < filter_hours]
|
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":
|
elif filter_type == "worked_more":
|
||||||
filtered = [r for r in all_residents if r.inactive_hours > filter_hours]
|
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":
|
elif filter_type == "worked_less":
|
||||||
filtered = [r for r in all_residents if r.inactive_hours < filter_hours]
|
filtered = [r for r in all_residents if r.inactive_hours < filter_hours]
|
||||||
filter_description = f"отработанных часов < {filter_hours}"
|
filter_description = f"отработанным часам < {filter_hours}"
|
||||||
else:
|
else:
|
||||||
filtered = all_residents
|
filtered = all_residents
|
||||||
filter_description = "всем резидентам"
|
filter_description = "всем резидентам"
|
||||||
|
|||||||
Reference in New Issue
Block a user