From 4a811109ff2a96e40bdbe2848a6afa9f46a67dab Mon Sep 17 00:00:00 2001 From: romanskijdev Date: Thu, 25 Jun 2026 12:50:24 +0300 Subject: [PATCH] fix report generation --- service/telegram_service/handlers/approval/handler_report.go | 3 +-- service/telegram_service/keyboard/misc.go | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/service/telegram_service/handlers/approval/handler_report.go b/service/telegram_service/handlers/approval/handler_report.go index 14bf7f8..5ad64c7 100644 --- a/service/telegram_service/handlers/approval/handler_report.go +++ b/service/telegram_service/handlers/approval/handler_report.go @@ -30,11 +30,10 @@ func (h *Handler) getTopicCodeByApproval(ctx context.Context, a *typescore.Appro const reportDateLayout = "02.01.2006" -// HandleReportMenu — первый шаг: показываем выбор типа отчёта. // HandleReportMenu — сразу показываем выбор периода (тип отчёта один — согласования). func (h *Handler) HandleReportMenu(bot *tgbotapi.BotAPI, chatID int64, telegramID int64) { ctx, cancel := context.WithTimeout(context.Background(), variables.ContextTimeoutBase) - cancel() + defer cancel() user, err := h.ipc.Database.User.GetUserByTelegramIDDB(ctx, telegramID) if err != nil || user == nil || user.ID == nil { diff --git a/service/telegram_service/keyboard/misc.go b/service/telegram_service/keyboard/misc.go index 1508b00..26fe742 100644 --- a/service/telegram_service/keyboard/misc.go +++ b/service/telegram_service/keyboard/misc.go @@ -197,6 +197,7 @@ func BuildObserverApprovalList(approvals []*typescore.Approval, initiators map[u func BuildReportDateToMenu() interface{} { return tgkit.NewInlineKeyboard(). Row(tgkit.Btn("📤 Выгрузить (по сегодня)", "report_generate")). + Row(tgkit.Btn("Указать даты", "report_set_dates")). Build() } -- 2.43.0