- Загрузка...
+
+
Загрузка...
+
+
diff --git a/frontend/admin/js/main.js b/frontend/admin/js/main.js
index 4fda5d3..bff3cf5 100755
--- a/frontend/admin/js/main.js
+++ b/frontend/admin/js/main.js
@@ -3,7 +3,7 @@ if (!['localhost', '127.0.0.1'].includes(window.location.hostname)) {
import('./otel.js').catch(e => console.warn('OTel init skipped:', e.message));
}
-import { isAuthenticatedAsAny, logout } from './api.js';
+import { api, isAuthenticatedAsAny, logout } from './api.js';
import { applyRippleEffect, closeAllDropdownsOnOutsideClick } from './utils.js';
import { startDropdownAutoObserver, initAllCustomDropdowns } from './dropdown.js';
@@ -38,6 +38,14 @@ const ROUTES = {
await module.initUsers();
}
},
+ 'teacher-requests': {
+ title: 'Заявки',
+ file: '/admin/views/teacher-requests.html',
+ init: async () => {
+ const module = await import('./views/teacher-requests.js');
+ await module.initTeacherRequests();
+ }
+ },
groups: {
title: 'Управление группами',
file: '/admin/views/groups.html',
@@ -115,7 +123,7 @@ const ROUTES = {
const ROLE_NAVIGATION = {
ADMIN: {
defaultTab: 'dashboard',
- tabs: ['dashboard', 'schedule', 'academic-calendar', 'auditorium-workload', 'schedule-view', 'classrooms', 'groups', 'university-structure', 'subjects', 'users']
+ tabs: ['dashboard', 'teacher-requests', 'schedule', 'academic-calendar', 'auditorium-workload', 'schedule-view', 'classrooms', 'groups', 'university-structure', 'subjects', 'users']
},
EDUCATION_OFFICE: {
defaultTab: 'dashboard',
@@ -143,6 +151,8 @@ const menuToggle = document.getElementById('menu-toggle');
const sidebarCloseBtn = document.getElementById('sidebar-close-btn');
const btnLogout = document.getElementById('btn-logout');
const main = document.querySelector('.main');
+const teacherRequestsNavBadge = document.getElementById('teacher-requests-nav-badge');
+const teacherRequestsTitleBadge = document.getElementById('teacher-requests-title-badge');
const roleNavigation = ROLE_NAVIGATION[currentRole] || ROLE_NAVIGATION.SCHEDULE_VIEWER;
const allowedTabs = new Set(roleNavigation.tabs);
@@ -150,6 +160,7 @@ const allowedTabs = new Set(roleNavigation.tabs);
applyRippleEffect();
closeAllDropdownsOnOutsideClick();
configureRoleInterface();
+refreshTeacherRequestBadge();
// Init sidebar state from localStorage on load
if (window.innerWidth > 768 && localStorage.getItem('sidebar-collapsed') === 'true') {
@@ -207,6 +218,10 @@ btnLogout.addEventListener('click', async () => {
window.location.href = '/';
});
+teacherRequestsTitleBadge?.addEventListener('click', () => {
+ switchTab('teacher-requests');
+});
+
// Navigation
navItems.forEach(item => {
item.addEventListener('click', (e) => {
@@ -271,6 +286,42 @@ function configureRoleInterface() {
document.querySelector('.logo span').textContent = firstAllowedTitle;
}
+async function refreshTeacherRequestBadge(countOverride = null) {
+ if (currentRole !== 'ADMIN') return;
+ try {
+ const count = countOverride === null
+ ? (await api.get('/api/teacher-requests?status=PENDING') || []).length
+ : countOverride;
+ updateTeacherRequestBadge(teacherRequestsNavBadge, count, count > 99 ? '99+' : String(count));
+ updateTeacherRequestBadge(teacherRequestsTitleBadge, count, requestCountLabel(count));
+ } catch (error) {
+ if (teacherRequestsNavBadge) teacherRequestsNavBadge.hidden = true;
+ if (teacherRequestsTitleBadge) teacherRequestsTitleBadge.hidden = true;
+ console.warn('Не удалось загрузить счётчик заявок:', error.message);
+ }
+}
+
+function updateTeacherRequestBadge(element, count, label) {
+ if (!element) return;
+ const normalizedCount = Number(count) || 0;
+ element.textContent = label;
+ element.hidden = normalizedCount <= 0;
+ element.setAttribute('aria-hidden', normalizedCount <= 0 ? 'true' : 'false');
+ element.setAttribute('aria-label', normalizedCount > 0 ? `Заявок в очереди: ${normalizedCount}` : 'Заявок в очереди нет');
+}
+
+function requestCountLabel(count) {
+ const mod10 = count % 10;
+ const mod100 = count % 100;
+ if (mod10 === 1 && mod100 !== 11) return `${count} заявка`;
+ if (mod10 >= 2 && mod10 <= 4 && (mod100 < 12 || mod100 > 14)) return `${count} заявки`;
+ return `${count} заявок`;
+}
+
+document.addEventListener('teacherRequestsChanged', (event) => {
+ refreshTeacherRequestBadge(Number.isFinite(event.detail?.count) ? event.detail.count : null);
+});
+
const hashTab = window.location.hash.replace('#', '');
switchTab(allowedTabs.has(hashTab) ? hashTab : roleNavigation.defaultTab);
diff --git a/frontend/admin/js/views/teacher-requests.js b/frontend/admin/js/views/teacher-requests.js
new file mode 100644
index 0000000..787b0db
--- /dev/null
+++ b/frontend/admin/js/views/teacher-requests.js
@@ -0,0 +1,136 @@
+import { api } from '../api.js';
+import { escapeHtml, hideAlert, showAlert } from '../utils.js';
+
+export async function initTeacherRequests() {
+ const requestsTbody = document.getElementById('teacher-requests-tbody');
+ const refreshButton = document.getElementById('teacher-requests-refresh');
+ const requestsCount = document.getElementById('teacher-requests-count');
+ let departments = [];
+
+ async function loadDepartments() {
+ departments = await api.get('/api/departments');
+ }
+
+ async function loadRequests() {
+ requestsTbody.innerHTML = '| Загрузка... |
';
+ hideAlert('teacher-requests-alert');
+ try {
+ const requests = await api.get('/api/teacher-requests?status=PENDING');
+ const normalizedRequests = Array.isArray(requests) ? requests : [];
+ renderRequests(normalizedRequests);
+ updateCount(normalizedRequests.length);
+ document.dispatchEvent(new CustomEvent('teacherRequestsChanged', {
+ detail: { count: normalizedRequests.length }
+ }));
+ } catch (error) {
+ requestsTbody.innerHTML = `| ${escapeHtml(error.message || 'Ошибка загрузки заявок')} |
`;
+ updateCount(0);
+ }
+ }
+
+ function renderRequests(requests) {
+ if (!requests.length) {
+ requestsTbody.innerHTML = '| Нет заявок на рассмотрении |
';
+ return;
+ }
+ requestsTbody.innerHTML = requests.map(request => `
+
+ |
+
+ |
+ |
+ |
+ |
+ |
+ ${escapeHtml(request.comment || '-')} |
+
+
+
+
+
+ |
+
+ `).join('');
+ }
+
+ function updateCount(count) {
+ if (!requestsCount) return;
+ requestsCount.textContent = requestCountLabel(count);
+ }
+
+ function requestCountLabel(count) {
+ const mod10 = count % 10;
+ const mod100 = count % 100;
+ if (mod10 === 1 && mod100 !== 11) return `${count} заявка`;
+ if (mod10 >= 2 && mod10 <= 4 && (mod100 < 12 || mod100 > 14)) return `${count} заявки`;
+ return `${count} заявок`;
+ }
+
+ async function approveRequest(row, requestId) {
+ const payload = {
+ departmentId: Number(row.querySelector('.teacher-request-department')?.value),
+ username: row.querySelector('.teacher-request-username')?.value.trim(),
+ fullName: row.querySelector('.teacher-request-fullname')?.value.trim(),
+ jobTitle: row.querySelector('.teacher-request-jobtitle')?.value.trim(),
+ password: row.querySelector('.teacher-request-password')?.value
+ };
+ if (!payload.departmentId || !payload.username || !payload.fullName || !payload.password) {
+ showAlert('teacher-requests-alert', 'Заполните кафедру, логин, ФИО и пароль', 'error');
+ return;
+ }
+ if (payload.password.length < 8) {
+ showAlert('teacher-requests-alert', 'Пароль должен быть не короче 8 символов', 'error');
+ return;
+ }
+ try {
+ await api.post(`/api/teacher-requests/${encodeURIComponent(requestId)}/approve`, payload);
+ showAlert('teacher-requests-alert', 'Преподаватель создан, заявка одобрена', 'success');
+ await loadRequests();
+ } catch (error) {
+ showAlert('teacher-requests-alert', error.message || 'Ошибка одобрения заявки', 'error');
+ }
+ }
+
+ async function rejectRequest(requestId) {
+ const reviewComment = prompt('Причина отклонения');
+ if (reviewComment === null) return;
+ try {
+ await api.post(`/api/teacher-requests/${encodeURIComponent(requestId)}/reject`, { reviewComment });
+ showAlert('teacher-requests-alert', 'Заявка отклонена', 'success');
+ await loadRequests();
+ } catch (error) {
+ showAlert('teacher-requests-alert', error.message || 'Ошибка отклонения заявки', 'error');
+ }
+ }
+
+ refreshButton?.addEventListener('click', loadRequests);
+
+ requestsTbody.addEventListener('click', async (event) => {
+ const approveButton = event.target.closest('.teacher-request-approve');
+ const rejectButton = event.target.closest('.teacher-request-reject');
+ if (!approveButton && !rejectButton) return;
+
+ const row = event.target.closest('tr[data-request-id]');
+ const requestId = row?.dataset.requestId;
+ if (!requestId) return;
+
+ if (approveButton) {
+ await approveRequest(row, requestId);
+ return;
+ }
+ await rejectRequest(requestId);
+ });
+
+ try {
+ await loadDepartments();
+ await loadRequests();
+ } catch (error) {
+ requestsTbody.innerHTML = `| ${escapeHtml(error.message || 'Ошибка загрузки')} |
`;
+ }
+}
diff --git a/frontend/admin/js/views/users.js b/frontend/admin/js/views/users.js
index 92be2a7..d70ce31 100644
--- a/frontend/admin/js/views/users.js
+++ b/frontend/admin/js/views/users.js
@@ -21,9 +21,6 @@ const ROLE_BADGE = {
export async function initUsers() {
const usersTbody = document.getElementById('users-tbody');
const createForm = document.getElementById('create-form');
- const teacherRequestsTbody = document.getElementById('teacher-requests-tbody');
- const teacherRequestsRefresh = document.getElementById('teacher-requests-refresh');
- let departments = [];
async function loadUsers() {
try {
@@ -36,53 +33,6 @@ export async function initUsers() {
}
}
- async function loadDepartments() {
- departments = await api.get('/api/departments');
- }
-
- async function loadTeacherRequests() {
- if (!teacherRequestsTbody) return;
- teacherRequestsTbody.innerHTML = '| Загрузка... |
';
- hideAlert('teacher-requests-alert');
- try {
- const requests = await api.get('/api/teacher-requests?status=PENDING');
- renderTeacherRequests(Array.isArray(requests) ? requests : []);
- } catch (error) {
- teacherRequestsTbody.innerHTML = `| ${escapeHtml(error.message || 'Ошибка загрузки заявок')} |
`;
- }
- }
-
- function renderTeacherRequests(requests) {
- if (!requests.length) {
- teacherRequestsTbody.innerHTML = '| Нет заявок на рассмотрении |
';
- return;
- }
- teacherRequestsTbody.innerHTML = requests.map(request => `
-
- |
-
- |
- |
- |
- |
- |
- ${escapeHtml(request.comment || '-')} |
-
-
-
-
-
- |
-
- `).join('');
- }
-
function renderUsers(users) {
if (!users || !users.length) {
usersTbody.innerHTML = '| Нет пользователей |
';
@@ -143,54 +93,6 @@ export async function initUsers() {
}
});
- teacherRequestsRefresh?.addEventListener('click', loadTeacherRequests);
-
- teacherRequestsTbody?.addEventListener('click', async (event) => {
- const approveButton = event.target.closest('.teacher-request-approve');
- const rejectButton = event.target.closest('.teacher-request-reject');
- if (!approveButton && !rejectButton) return;
-
- const row = event.target.closest('tr[data-request-id]');
- const requestId = row?.dataset.requestId;
- if (!requestId) return;
-
- if (approveButton) {
- const payload = {
- departmentId: Number(row.querySelector('.teacher-request-department')?.value),
- username: row.querySelector('.teacher-request-username')?.value.trim(),
- fullName: row.querySelector('.teacher-request-fullname')?.value.trim(),
- jobTitle: row.querySelector('.teacher-request-jobtitle')?.value.trim(),
- password: row.querySelector('.teacher-request-password')?.value
- };
- if (!payload.departmentId || !payload.username || !payload.fullName || !payload.password) {
- showAlert('teacher-requests-alert', 'Заполните кафедру, логин, ФИО и пароль', 'error');
- return;
- }
- if (payload.password.length < 8) {
- showAlert('teacher-requests-alert', 'Пароль должен быть не короче 8 символов', 'error');
- return;
- }
- try {
- await api.post(`/api/teacher-requests/${encodeURIComponent(requestId)}/approve`, payload);
- showAlert('teacher-requests-alert', 'Преподаватель создан, заявка одобрена', 'success');
- await Promise.all([loadTeacherRequests(), loadUsers()]);
- } catch (error) {
- showAlert('teacher-requests-alert', error.message || 'Ошибка одобрения заявки', 'error');
- }
- return;
- }
-
- const reviewComment = prompt('Причина отклонения');
- if (reviewComment === null) return;
- try {
- await api.post(`/api/teacher-requests/${encodeURIComponent(requestId)}/reject`, { reviewComment });
- showAlert('teacher-requests-alert', 'Заявка отклонена', 'success');
- await loadTeacherRequests();
- } catch (error) {
- showAlert('teacher-requests-alert', error.message || 'Ошибка отклонения заявки', 'error');
- }
- });
-
usersTbody.addEventListener('click', async (e) => {
const deleteBtn = e.target.closest('.btn-archive-user');
if (!deleteBtn) return;
@@ -216,6 +118,5 @@ export async function initUsers() {
}
});
- await loadDepartments();
- await Promise.all([loadUsers(), loadTeacherRequests()]);
+ await loadUsers();
}
diff --git a/frontend/admin/views/department-workspace.html b/frontend/admin/views/department-workspace.html
index d85a4b8..8f4d13a 100644
--- a/frontend/admin/views/department-workspace.html
+++ b/frontend/admin/views/department-workspace.html
@@ -1,10 +1,10 @@
-