From fb894c8bd803e1cc1e8d8045ab0202624f99ba53 Mon Sep 17 00:00:00 2001 From: romanskijdev Date: Wed, 14 Oct 2026 10:56:11 +0300 Subject: [PATCH] Fix approver name in approval card --- .../telegram_service/handlers/approval/selection_approver.go | 2 +- service/telegram_service/keyboard/delegation.go | 2 ++ service/telegram_service/keyboard/menu.go | 2 -- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/service/telegram_service/handlers/approval/selection_approver.go b/service/telegram_service/handlers/approval/selection_approver.go index 64737cb..83829c3 100644 --- a/service/telegram_service/handlers/approval/selection_approver.go +++ b/service/telegram_service/handlers/approval/selection_approver.go @@ -402,7 +402,7 @@ func (h *Handler) sendConfirmationCard(bot *tgbotapi.BotAPI, ctx context.Context if actualApprover != nil && actualApprover.FullName != nil { approverLine = *actualApprover.FullName if actualApprover.ID != nil && originalApprover.ID != nil && *actualApprover.ID != *originalApprover.ID { - approverLine += fmt.Sprintf(" (Временно исполняющий обязанности %s)", *originalApprover.FullName) + approverLine += fmt.Sprintf(" (Временно исполняющий обязанности за: %s)", *originalApprover.FullName) } } } diff --git a/service/telegram_service/keyboard/delegation.go b/service/telegram_service/keyboard/delegation.go index a179738..88e76f2 100644 --- a/service/telegram_service/keyboard/delegation.go +++ b/service/telegram_service/keyboard/delegation.go @@ -16,7 +16,9 @@ const delegationPerPage = 6 func BuildDelegationMainMenu() interface{} { return tgkit.NewInlineKeyboard(). Row(tgkit.BtnStyled(tgkit.ButtonStyleSuccess, "Делегировать заявки", "deleg_create")). + Row(tgkit.BtnStyled(tgkit.ButtonStyleSuccess, "Делегировать задачи", "deleg_task_create")). Row(tgkit.Btn("📋 Мои делегирования (Заявки)", "deleg_list")). + Row(tgkit.Btn("📋 Мои делегирования (Задачи)", "deleg_task_list")). Build() } diff --git a/service/telegram_service/keyboard/menu.go b/service/telegram_service/keyboard/menu.go index d882787..b0f4a28 100644 --- a/service/telegram_service/keyboard/menu.go +++ b/service/telegram_service/keyboard/menu.go @@ -37,8 +37,6 @@ func BuildMainMenu(roles UserRole) tgbotapi.ReplyKeyboardMarkup { // Раздел: Исполнитель if roles.IsExecutor { kb.Row("Задачи к исполнению") - kb.Row(tgkit.BtnStyled(tgkit.ButtonStyleSuccess, "Делегировать задачи", "deleg_task_create")) - kb.Row(tgkit.Btn("📋 Мои делегирования (Задачи)", "deleg_task_list")) } // Общие кнопки — всегда внизу