feat: add subjects & teacher-subjects management tab in admin panel

frontend/admin/admin.js

@@ -73,6 +73,16 @@
     const createEquipmentAlert = document.getElementById('create-equipment-alert');
     const equipmentCheckboxes = document.getElementById('equipment-checkboxes');
 
+    // Subjects
+    const subjectsTbody = document.getElementById('subjects-tbody');
+    const createSubjectForm = document.getElementById('create-subject-form');
+    const createSubjectAlert = document.getElementById('create-subject-alert');
+    const assignTeacherForm = document.getElementById('assign-teacher-form');
+    const assignTeacherAlert = document.getElementById('assign-teacher-alert');
+    const assignTeacherSelect = document.getElementById('assign-teacher-select');
+    const assignSubjectSelect = document.getElementById('assign-subject-select');
+    const teacherSubjectsTbody = document.getElementById('teacher-subjects-tbody');
+
     // --- Multi-select logic ---
     function updateSelectText(containerId, textId) {
         const container = document.getElementById(containerId);
@@ -130,6 +140,8 @@
     let allGroups = [];
     let allEducationForms = [];
     let allEquipments = [];
+    let allSubjects = [];
+    let allTeachers = [];
 
     // ---- Tab Switching ----
     const TAB_TITLES = {
@@ -137,7 +149,8 @@
         groups: 'Управление группами',
         'edu-forms': 'Формы обучения',
         equipments: 'Оборудование',
-        classrooms: 'Аудитории'
+        classrooms: 'Аудитории',
+        subjects: 'Дисциплины и преподаватели'
     };
 
     navItems.forEach(item => {
@@ -162,6 +175,7 @@
         if (tab === 'edu-forms') loadEducationForms();
         if (tab === 'equipments') loadEquipments();
         if (tab === 'classrooms') { loadEquipments().then(() => loadClassrooms()); }
+        if (tab === 'subjects') { Promise.all([loadSubjects(), loadTeachers()]).then(() => loadTeacherSubjects()); }
 
         sidebar.classList.remove('open');
         sidebarOverlay.classList.remove('open');
@@ -711,6 +725,178 @@
         } catch (e) { showAlert(editClassroomAlert, 'Ошибка соединения', 'error'); }
     });
 
+    // ============================================================
+    //  SUBJECTS
+    // ============================================================
+
+    async function loadSubjects() {
+        try {
+            const res = await fetch('/api/subjects', {
+                headers: { 'Authorization': 'Bearer ' + token },
+            });
+            allSubjects = await res.json();
+            renderSubjects(allSubjects);
+            populateSubjectSelect(allSubjects);
+        } catch (e) {
+            if (subjectsTbody) subjectsTbody.innerHTML = '<tr><td colspan="3" class="loading-row">Ошибка загрузки</td></tr>';
+        }
+    }
+
+    function renderSubjects(subjects) {
+        if (!subjects.length) {
+            subjectsTbody.innerHTML = '<tr><td colspan="3" class="loading-row">Нет дисциплин</td></tr>';
+            return;
+        }
+        subjectsTbody.innerHTML = subjects.map(s => `
+      <tr>
+        <td>${s.id}</td>
+        <td>${escapeHtml(s.name)}</td>
+        <td><button class="btn-delete" data-id="${s.id}">Удалить</button></td>
+      </tr>`).join('');
+    }
+
+    function populateSubjectSelect(subjects) {
+        if (!assignSubjectSelect) return;
+        const currentVal = assignSubjectSelect.value;
+        assignSubjectSelect.innerHTML = '<option value="">Выберите дисциплину</option>' +
+            subjects.map(s => `<option value="${s.id}">${escapeHtml(s.name)}</option>`).join('');
+        if (currentVal && subjects.find(s => s.id == currentVal)) {
+            assignSubjectSelect.value = currentVal;
+        }
+    }
+
+    async function loadTeachers() {
+        try {
+            const res = await fetch('/api/users/teachers', {
+                headers: { 'Authorization': 'Bearer ' + token },
+            });
+            allTeachers = await res.json();
+            populateTeacherSelect(allTeachers);
+        } catch (e) {
+            if (assignTeacherSelect) assignTeacherSelect.innerHTML = '<option value="">Ошибка загрузки</option>';
+        }
+    }
+
+    function populateTeacherSelect(teachers) {
+        if (!assignTeacherSelect) return;
+        const currentVal = assignTeacherSelect.value;
+        if (!teachers.length) {
+            assignTeacherSelect.innerHTML = '<option value="">Нет преподавателей</option>';
+            return;
+        }
+        assignTeacherSelect.innerHTML = '<option value="">Выберите преподавателя</option>' +
+            teachers.map(t => `<option value="${t.id}">${escapeHtml(t.username)}</option>`).join('');
+        if (currentVal && teachers.find(t => t.id == currentVal)) {
+            assignTeacherSelect.value = currentVal;
+        }
+    }
+
+    async function loadTeacherSubjects() {
+        try {
+            const res = await fetch('/api/teacher-subjects', {
+                headers: { 'Authorization': 'Bearer ' + token },
+            });
+            const tsData = await res.json();
+            renderTeacherSubjects(tsData);
+        } catch (e) {
+            if (teacherSubjectsTbody) teacherSubjectsTbody.innerHTML = '<tr><td colspan="3" class="loading-row">Ошибка загрузки</td></tr>';
+        }
+    }
+
+    function renderTeacherSubjects(tsArray) {
+        if (!tsArray.length) {
+            teacherSubjectsTbody.innerHTML = '<tr><td colspan="3" class="loading-row">Нет привязок</td></tr>';
+            return;
+        }
+        teacherSubjectsTbody.innerHTML = tsArray.map(ts => `
+      <tr>
+        <td>${escapeHtml(ts.username)}</td>
+        <td>${escapeHtml(ts.subjectName)}</td>
+        <td><button class="btn-delete" data-user-id="${ts.userId}" data-subject-id="${ts.subjectId}">Удалить</button></td>
+      </tr>`).join('');
+    }
+
+    createSubjectForm.addEventListener('submit', async (e) => {
+        e.preventDefault();
+        hideAlert(createSubjectAlert);
+        const name = document.getElementById('new-subject-name').value.trim();
+        if (!name) { showAlert(createSubjectAlert, 'Введите название', 'error'); return; }
+
+        try {
+            const res = await fetch('/api/subjects', {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json', 'Authorization': 'Bearer ' + token },
+                body: JSON.stringify({ name }),
+            });
+            const data = await res.json();
+            if (res.ok) {
+                showAlert(createSubjectAlert, `Дисциплина "${data.name}" добавлена`, 'success');
+                createSubjectForm.reset();
+                loadSubjects();
+            } else {
+                showAlert(createSubjectAlert, data.message || 'Ошибка создания', 'error');
+            }
+        } catch (e) { showAlert(createSubjectAlert, 'Ошибка соединения', 'error'); }
+    });
+
+    subjectsTbody.addEventListener('click', async (e) => {
+        const btn = e.target.closest('.btn-delete');
+        if (!btn) return;
+        if (!confirm('Удалить дисциплину?')) return;
+        try {
+            const res = await fetch('/api/subjects/' + btn.dataset.id, {
+                method: 'DELETE',
+                headers: { 'Authorization': 'Bearer ' + token },
+            });
+            if (res.ok) {
+                loadSubjects();
+                loadTeacherSubjects();
+            } else {
+                const data = await res.json();
+                alert(data.message || 'Ошибка удаления');
+            }
+        } catch (e) { alert('Ошибка соединения'); }
+    });
+
+    assignTeacherForm.addEventListener('submit', async (e) => {
+        e.preventDefault();
+        hideAlert(assignTeacherAlert);
+        const userId = assignTeacherSelect.value;
+        const subjectId = assignSubjectSelect.value;
+        if (!userId) { showAlert(assignTeacherAlert, 'Выберите преподавателя', 'error'); return; }
+        if (!subjectId) { showAlert(assignTeacherAlert, 'Выберите дисциплину', 'error'); return; }
+
+        try {
+            const res = await fetch('/api/teacher-subjects', {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json', 'Authorization': 'Bearer ' + token },
+                body: JSON.stringify({ userId: Number(userId), subjectId: Number(subjectId) }),
+            });
+            const data = await res.json();
+            if (res.ok) {
+                showAlert(assignTeacherAlert, 'Привязка создана', 'success');
+                loadTeacherSubjects();
+            } else {
+                showAlert(assignTeacherAlert, data.message || 'Ошибка привязки', 'error');
+            }
+        } catch (e) { showAlert(assignTeacherAlert, 'Ошибка соединения', 'error'); }
+    });
+
+    teacherSubjectsTbody.addEventListener('click', async (e) => {
+        const btn = e.target.closest('.btn-delete');
+        if (!btn) return;
+        if (!confirm('Удалить привязку?')) return;
+        try {
+            const res = await fetch('/api/teacher-subjects', {
+                method: 'DELETE',
+                headers: { 'Content-Type': 'application/json', 'Authorization': 'Bearer ' + token },
+                body: JSON.stringify({ userId: Number(btn.dataset.userId), subjectId: Number(btn.dataset.subjectId) }),
+            });
+            if (res.ok) loadTeacherSubjects();
+            else alert('Ошибка удаления');
+        } catch (e) { alert('Ошибка соединения'); }
+    });
+
     // ============================================================
     //  LOGOUT & INIT
     // ============================================================

frontend/admin/index.html

@@ -74,6 +74,14 @@
                 </svg>
                 Аудитории
             </a>
+            <a href="#" class="nav-item" data-tab="subjects">
+                <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"
+                    stroke-linecap="round" stroke-linejoin="round">
+                    <path d="M12 20h9" />
+                    <path d="M16.5 3.5a2.121 2.121 0 0 1 3 3L7 19l-4 1 1-4L16.5 3.5z" />
+                </svg>
+                Дисциплины
+            </a>
         </nav>
         <div class="sidebar-footer">
             <button class="btn-logout" id="btn-logout">
@@ -343,6 +351,82 @@
             </div>
         </section>
 
+        <!-- ===== Subjects Tab ===== -->
+        <section class="content tab-content" id="tab-subjects" style="display:none;">
+            <div class="card create-card">
+                <h2>Новая дисциплина</h2>
+                <form id="create-subject-form">
+                    <div class="form-row">
+                        <div class="form-group">
+                            <label for="new-subject-name">Название дисциплины</label>
+                            <input type="text" id="new-subject-name" placeholder="Высшая математика" required>
+                        </div>
+                        <button type="submit" class="btn-create">Добавить</button>
+                    </div>
+                    <div class="form-alert" id="create-subject-alert" role="alert"></div>
+                </form>
+            </div>
+            <div class="card create-card">
+                <h2>Привязка преподавателя к дисциплине</h2>
+                <form id="assign-teacher-form">
+                    <div class="form-row">
+                        <div class="form-group">
+                            <label for="assign-teacher-select">Преподаватель</label>
+                            <select id="assign-teacher-select">
+                                <option value="">Загрузка...</option>
+                            </select>
+                        </div>
+                        <div class="form-group">
+                            <label for="assign-subject-select">Дисциплина</label>
+                            <select id="assign-subject-select">
+                                <option value="">Загрузка...</option>
+                            </select>
+                        </div>
+                        <button type="submit" class="btn-create">Привязать</button>
+                    </div>
+                    <div class="form-alert" id="assign-teacher-alert" role="alert"></div>
+                </form>
+            </div>
+            <div class="card">
+                <h2>Все дисциплины</h2>
+                <div class="table-wrap">
+                    <table id="subjects-table">
+                        <thead>
+                            <tr>
+                                <th>ID</th>
+                                <th>Название</th>
+                                <th></th>
+                            </tr>
+                        </thead>
+                        <tbody id="subjects-tbody">
+                            <tr>
+                                <td colspan="3" class="loading-row">Загрузка...</td>
+                            </tr>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+            <div class="card">
+                <h2>Привязки преподавателей</h2>
+                <div class="table-wrap">
+                    <table id="teacher-subjects-table">
+                        <thead>
+                            <tr>
+                                <th>Преподаватель</th>
+                                <th>Дисциплина</th>
+                                <th></th>
+                            </tr>
+                        </thead>
+                        <tbody id="teacher-subjects-tbody">
+                            <tr>
+                                <td colspan="3" class="loading-row">Загрузка...</td>
+                            </tr>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </section>
+
         <!-- ===== Edit Classroom Modal ===== -->
         <div class="modal-overlay" id="modal-edit-classroom">
             <div class="modal-content">