SmartSolTech/Touchh
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

ECVI fully functional

Browse Source
This commit is contained in:
trevor
2024-12-27 14:47:04 +09:00
parent 9bff204fb4
commit 6af0886a64
10 changed files with 162 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
bot/operations/statistics.py
View File

@@ -55,10 +55,13 @@ async def stats_select_period(update: Update, context: ContextTypes.DEFAULT_TYPE
context.user_data["selected_hotel"] = hotel_id
keyboard = [
[InlineKeyboardButton("День", callback_data="stats_period_day")],
[InlineKeyboardButton("Сегодня", callback_data="stats_period_today")],
[InlineKeyboardButton("Вчера", callback_data="stats_period_yesterday")],
[InlineKeyboardButton("Неделя", callback_data="stats_period_week")],
[InlineKeyboardButton("Месяц", callback_data="stats_period_month")],
[InlineKeyboardButton("Год", callback_data="stats_period_year")],
[InlineKeyboardButton("Этот месяц", callback_data="stats_period_thismonth")],
[InlineKeyboardButton("Прошлый месяц", callback_data="stats_period_lastmonth")],
[InlineKeyboardButton("Этот год", callback_data="stats_period_thisyear")],
[InlineKeyboardButton("Прошлый год", callback_data="stats_period_lastyear")],
[InlineKeyboardButton("🏠 Главная", callback_data="main_menu")],
[InlineKeyboardButton("🔙 Назад", callback_data="statistics")],
]
@@ -140,7 +143,7 @@ def get_period_dates(period, now=None):
start_date = now.replace(day=1, hour=0, minute=0, second=0, microsecond=0)
end_date = now.replace(hour=23, minute=59, second=59, microsecond=999999)
elif period == "last_month":
elif period == "lastmonth":
# Последний месяц: с первого дня прошлого месяца до последнего дня прошлого месяца
first_day_of_current_month = now.replace(day=1, hour=0, minute=0, second=0, microsecond=0)
last_day_of_previous_month = first_day_of_current_month - timedelta(days=1)
@@ -152,7 +155,7 @@ def get_period_dates(period, now=None):
start_date = now.replace(month=1, day=1, hour=0, minute=0, second=0, microsecond=0)
end_date = now.replace(hour=23, minute=59, second=59, microsecond=999999)
elif period == "last_year":
elif period == "lastyear":
# Последний год: с 1 января предыдущего года до 31 декабря предыдущего года
start_date = now.replace(year=now.year - 1, month=1, day=1, hour=0, minute=0, second=0, microsecond=0)
end_date = now.replace(year=now.year - 1, month=12, day=31, hour=23, minute=59, second=59, microsecond=999999)