diff --git a/backend/app/bot/notifications.py b/backend/app/bot/notifications.py index 397f5a4..313b183 100644 --- a/backend/app/bot/notifications.py +++ b/backend/app/bot/notifications.py @@ -1,21 +1,34 @@ -"""Notifications module for the Telegram bot""" -from .config import settings +""" +Notifications module for the Telegram bot. +Handles sending notifications about new requests and status updates. +""" +from aiogram import types +from .config import NOTIFICATION_CHAT_ID from . import bot from .handlers import get_updated_keyboard async def send_notification(request_data: dict): - """Send notification about new request to Telegram chat""" + """ + Send notification about new request to Telegram chat. + + Args: + request_data (dict): Request data including id, description, etc. + """ message_text = ( - f"Новая заявка №{request_data['id']}\n" - f"Отдел: {request_data['department']}\n" - f"Тип: {request_data['request_type']}\n" - f"Приоритет: {request_data['priority']}\n" - f"Описание: {request_data['description']}" + f"📋 Заявка #{request_data['id']}\n\n" + f"👤 Сотрудник: {request_data['employee_last_name']} {request_data['employee_first_name']}\n" + f"🏢 Отдел: {department}\n" + f"🚪 Кабинет: {request_data['office']}\n" + f"{REQUEST_TYPE_EMOJI.get(request_data['request_type'], '📝')} Тип заявки: {request_type}\n" + f"{PRIORITY_EMOJI.get(request_data['priority'], '⚪')} Приоритет: {priority}\n\n" + f"📝 Описание:\n
{request_data['description']}\n\n" + f"🕒 Создана: {created_at}\n" + f"📊 Статус: {status}" ) try: await bot.send_message( - chat_id=settings.chat_id, + chat_id=NOTIFICATION_CHAT_ID, text=message_text, reply_markup=get_updated_keyboard(request_data['id'], "new") ) diff --git a/frontend/src/components/admin/EmployeeList.vue b/frontend/src/components/admin/EmployeeList.vue index cebd0bf..1d4520e 100644 --- a/frontend/src/components/admin/EmployeeList.vue +++ b/frontend/src/components/admin/EmployeeList.vue @@ -3,11 +3,13 @@ import { ref, onMounted } from 'vue'; import { departments } from '@/utils/constants'; import type { Employee } from '@/types/employee'; +import EmployeeForm from './EmployeeForm.vue'; // Добавляем импорт -const employees = ref