Миллион изменений, создание вкладки "Расписание занятий"

frontend/admin/js/views/users.js

@@ -8,173 +8,20 @@ export async function initUsers() {
     const usersTbody = document.getElementById('users-tbody');
     const createForm = document.getElementById('create-form');
 
-    // ===== Оверлей (cs-overlay) =====
-    const usersOverlay = document.getElementById('users-overlay');
-
-    // ===== 1-е модальное окно: Добавить занятие =====
-    const modalAddLesson = document.getElementById('modal-add-lesson');
-    const modalAddLessonClose = document.getElementById('modal-add-lesson-close');
-    const addLessonForm = document.getElementById('add-lesson-form');
-
-    const lessonGroupSelect = document.getElementById('lesson-group');
-    const lessonDisciplineSelect = document.getElementById('lesson-discipline');
-    const lessonClassroomSelect = document.getElementById('lesson-classroom');
-    const lessonTypeSelect = document.getElementById('lesson-type');
-    const lessonOnlineFormat = document.getElementById('format-online');
-    const lessonOfflineFormat = document.getElementById('format-offline');
-    const lessonUserId = document.getElementById('lesson-user-id');
-    const lessonDaySelect = document.getElementById('lesson-day');
-    const weekUpper = document.getElementById('week-upper');
-    const weekLower = document.getElementById('week-lower');
-    const lessonTimeSelect = document.getElementById('lesson-time');
-
-    // ===== 2-е модальное окно: Просмотр занятий =====
-    const modalViewLessons = document.getElementById('modal-view-lessons');
-    const lessonsContainer = document.getElementById('lessons-container');
-    const modalTeacherName = document.getElementById('modal-teacher-name');
-
-    let currentLessonsTeacherId = null;
-    let currentLessonsTeacherName = '';
-    // ===== Данные =====
-    let groups = [];
-    let subjects = [];
-    let classrooms = [];
-
-    const weekdaysTimes = [
-        "8:00-9:30",
-        "9:40-11:10",
-        "11:40-13:10",
-        "13:20-14:50",
-        "15:00-16:30",
-        "16:50-18:20",
-        "18:30-19:00"
-    ];
-
-    const saturdayTimes = [
-        "8:20-9:50",
-        "10:00-11:30",
-        "11:40-13:10",
-        "13:20-14:50"
-    ];
-
-    // =========================================================
-    // Загрузка справочников
-    // =========================================================
-    async function loadGroups() {
-        try {
-            groups = await api.get('/api/groups');
-            renderGroupOptions();
-        } catch (e) {
-            console.error('Ошибка загрузки групп:', e);
-        }
-    }
-
-    async function loadSubjects() {
-        try {
-            subjects = await api.get('/api/subjects');
-            renderSubjectOptions();
-        } catch (e) {
-            console.error('Ошибка загрузки дисциплин:', e);
-        }
-    }
-
-    async function loadClassrooms() {
-        try {
-            classrooms = await api.get('/api/classrooms');
-            renderClassroomsOptions();
-        } catch (e) {
-            console.error('Ошибка загрузки аудиторий:', e);
-        }
-    }
-
-    function renderGroupOptions() {
-        if (!groups || groups.length === 0) {
-            lessonGroupSelect.innerHTML = '<option value="">Нет доступных групп</option>';
-            return;
-        }
-
-        lessonGroupSelect.innerHTML =
-            '<option value="">Выберите группу</option>' +
-            groups.map(g => {
-                let optionText = escapeHtml(g.name);
-                if (g.groupSize) optionText += ` (численность: ${g.groupSize} чел.)`;
-                return `<option value="${g.id}">${optionText}</option>`;
-            }).join('');
-    }
-
-    function renderSubjectOptions() {
-        lessonDisciplineSelect.innerHTML =
-            '<option value="">Выберите дисциплину</option>' +
-            subjects.map(s => `<option value="${s.id}">${escapeHtml(s.name)}</option>`).join('');
-    }
-
-    function renderClassroomsOptions() {
-        if (!classrooms || classrooms.length === 0) {
-            lessonClassroomSelect.innerHTML = '<option value="">Нет доступных аудиторий</option>';
-            return;
-        }
-
-        const selectedGroupId = lessonGroupSelect.value;
-        const selectedGroup = groups?.find(g => g.id == selectedGroupId);
-        const groupSize = selectedGroup?.groupSize || 0;
-
-        lessonClassroomSelect.innerHTML =
-            '<option value="">Выберите аудиторию</option>' +
-            classrooms.map(c => {
-                let optionText = escapeHtml(c.name);
-
-                if (c.capacity) optionText += ` (вместимость: ${c.capacity} чел.)`;
-
-                if (c.isAvailable === false) {
-                    optionText += ` ❌ Занята`;
-                } else if (selectedGroupId && groupSize > 0 && c.capacity && groupSize > c.capacity) {
-                    optionText += ` ⚠️ Недостаточно места`;
-                }
-
-                return `<option value="${c.id}">${optionText}</option>`;
-            }).join('');
-    }
-
-    lessonGroupSelect.addEventListener('change', function () {
-        renderClassroomsOptions();
-        requestAnimationFrame(() => syncAddLessonHeight());
-    });
-
-    function updateTimeOptions(dayValue) {
-        let times = [];
-        if (dayValue === "Суббота") {
-            times = saturdayTimes;
-        } else if (dayValue && dayValue !== '') {
-            times = weekdaysTimes;
-        } else {
-            lessonTimeSelect.innerHTML = '<option value="">Сначала выберите день</option>';
-            lessonTimeSelect.disabled = true;
-            return;
-        }
-
-        lessonTimeSelect.innerHTML =
-            '<option value="">Выберите время</option>' +
-            times.map(t => `<option value="${t}">${t}</option>`).join('');
-        lessonTimeSelect.disabled = false;
-    }
-
-    // =========================================================
-    // Пользователи
-    // =========================================================
     async function loadUsers() {
         try {
             const users = await api.get('/api/users');
             renderUsers(users);
         } catch (e) {
             usersTbody.innerHTML =
-                '<tr><td colspan="8" class="loading-row">Ошибка загрузки: ' +
+                '<tr><td colspan="7" class="loading-row">Ошибка загрузки: ' +
                 escapeHtml(e.message) + '</td></tr>';
         }
     }
 
     function renderUsers(users) {
         if (!users || !users.length) {
-            usersTbody.innerHTML = '<tr><td colspan="8" class="loading-row">Нет пользователей</td></tr>';
+            usersTbody.innerHTML = '<tr><td colspan="7" class="loading-row">Нет пользователей</td></tr>';
             return;
         }
 
@@ -184,148 +31,15 @@ export async function initUsers() {
                 <td>${escapeHtml(u.username)}</td>
                 <td>${escapeHtml(u.fullName || '-')}</td>
                 <td>${escapeHtml(u.jobTitle || '-')}</td>
-                <td>${u.departmentName || '-'}</td>
+                <td>${escapeHtml(u.departmentName || '-')}</td>
                 <td><span class="badge ${ROLE_BADGE[u.role] || ''}">${ROLE_LABELS[u.role] || escapeHtml(u.role)}</span></td>
                 <td>
                     <button class="btn-delete" data-id="${u.id}">Удалить</button>
                 </td>
-                <td>
-                    <button class="btn-add-lesson" data-id="${u.id}" data-name="${escapeHtml(u.username)}">Добавить занятие</button>
-                </td>
             </tr>
         `).join('');
     }
 
-    // ===== Открытие / закрытие оверлея =====
-    function openOverlay() {
-        if (usersOverlay) usersOverlay.classList.add('open');
-    }
-    function closeOverlay() {
-        if (usersOverlay) usersOverlay.classList.remove('open');
-        if (modalViewLessons) modalViewLessons.style.display = 'none';
-        resetLessonForm();
-    }
-
-    // =========================================================
-    // 1-я модалка: добавление занятия
-    // =========================================================
-    function resetLessonForm() {
-        addLessonForm.reset();
-        lessonUserId.value = '';
-
-        if (weekUpper) weekUpper.checked = false;
-        if (weekLower) weekLower.checked = false;
-
-        if (lessonOfflineFormat) lessonOfflineFormat.checked = true;
-        if (lessonOnlineFormat) lessonOnlineFormat.checked = false;
-
-        lessonTimeSelect.innerHTML = '<option value="">Сначала выберите день</option>';
-        lessonTimeSelect.disabled = true;
-
-        hideAlert('add-lesson-alert');
-    }
-
-    function openAddLessonModal(userId) {
-        lessonUserId.value = userId;
-
-        lessonDaySelect.value = '';
-        updateTimeOptions('');
-
-        openOverlay();
-    }
-
-    addLessonForm.addEventListener('submit', async (e) => {
-        e.preventDefault();
-        hideAlert('add-lesson-alert');
-
-        const userId = lessonUserId.value;
-        const groupId = lessonGroupSelect.value;
-        const subjectId = lessonDisciplineSelect.value;
-        const classroomId = lessonClassroomSelect.value;
-        const lessonType = lessonTypeSelect.value;
-        const dayOfWeek = lessonDaySelect.value;
-        const timeSlot = lessonTimeSelect.value;
-
-        const lessonFormat = document.querySelector('input[name="lessonFormat"]:checked')?.value;
-
-        if (!groupId) { showAlert('add-lesson-alert', 'Выберите группу', 'error'); return; }
-        if (!subjectId) { showAlert('add-lesson-alert', 'Выберите дисциплину', 'error'); return; }
-        if (!classroomId) { showAlert('add-lesson-alert', 'Выберите аудиторию', 'error'); return; }
-        if (!dayOfWeek) { showAlert('add-lesson-alert', 'Выберите день недели', 'error'); return; }
-        if (!timeSlot) { showAlert('add-lesson-alert', 'Выберите время', 'error'); return; }
-
-        const weekUpperChecked = weekUpper?.checked || false;
-        const weekLowerChecked = weekLower?.checked || false;
-
-        if (!weekUpperChecked && !weekLowerChecked) {
-            showAlert('add-lesson-alert', 'Не выбран тип недели', 'error');
-            return;
-        }
-
-        let weekType = null;
-        if (weekUpperChecked && weekLowerChecked) weekType = 'Обе';
-        else if (weekUpperChecked) weekType = 'Верхняя';
-        else if (weekLowerChecked) weekType = 'Нижняя';
-
-        try {
-            await api.post('/api/users/lessons/create', {
-                teacherId: parseInt(userId),
-                groupId: parseInt(groupId),
-                subjectId: parseInt(subjectId),
-                classroomId: parseInt(classroomId),
-                typeLesson: lessonType,
-                lessonFormat: lessonFormat,
-                day: dayOfWeek,
-                week: weekType,
-                time: timeSlot
-            });
-
-            if (modalViewLessons?.style.display !== 'none' && currentLessonsTeacherId == userId) {
-                await loadTeacherLessons(currentLessonsTeacherId, currentLessonsTeacherName);
-            }
-
-            showAlert('add-lesson-alert', 'Занятие добавлено ✓', 'success');
-
-            lessonGroupSelect.selectedIndex = 0;
-            lessonDisciplineSelect.selectedIndex = 0;
-            lessonClassroomSelect.selectedIndex = 0;
-            lessonTypeSelect.selectedIndex = 0;
-            lessonDaySelect.selectedIndex = 0;
-            lessonTimeSelect.innerHTML = '<option value="">Сначала выберите день</option>';
-            lessonTimeSelect.disabled = true;
-
-            weekUpper.checked = false;
-            weekLower.checked = false;
-            document.querySelector('input[name="lessonFormat"][value="Очно"]').checked = true;
-
-            setTimeout(() => {
-                hideAlert('add-lesson-alert');
-            }, 3000);
-        } catch (err) {
-            showAlert('add-lesson-alert', err.message || 'Ошибка добавления занятия', 'error');
-        }
-    });
-
-    lessonDaySelect.addEventListener('change', function () {
-        updateTimeOptions(this.value);
-    });
-
-    if (modalAddLessonClose) {
-        modalAddLessonClose.addEventListener('click', () => closeOverlay());
-    }
-
-    // Клик по оверлею (мимо модалок) закрывает всё
-    if (usersOverlay) {
-        usersOverlay.querySelector('.cs-overlay-scroll')?.addEventListener('click', (e) => {
-            if (e.target.classList.contains('cs-overlay-scroll')) {
-                closeOverlay();
-            }
-        });
-    }
-
-    // =========================================================
-    // Создание пользователя
-    // =========================================================
     createForm.addEventListener('submit', async (e) => {
         e.preventDefault();
         hideAlert('create-alert');
@@ -343,9 +57,9 @@ export async function initUsers() {
         }
 
         try {
-            const data = await api.post('/api/users', { 
-                username, 
-                password, 
+            const data = await api.post('/api/users', {
+                username,
+                password,
                 role,
                 fullName,
                 jobTitle,
@@ -359,133 +73,18 @@ export async function initUsers() {
         }
     });
 
-    // =========================================================
-    // Инициализация
-    // =========================================================
-    await Promise.all([loadUsers(), loadGroups(), loadSubjects(), loadClassrooms()]);
-
-    // =========================================================
-    // 2-я модалка: просмотр занятий
-    // =========================================================
-    async function loadTeacherLessons(teacherId, teacherName) {
-        try {
-            lessonsContainer.innerHTML = '<div class="loading-lessons">Загрузка занятий...</div>';
-
-            modalTeacherName.textContent = teacherName
-                ? `Занятия преподавателя: ${teacherName}`
-                : 'Занятия преподавателя';
-
-            const lessons = await api.get(`/api/users/lessons/${teacherId}`);
-
-            if (!lessons || lessons.length === 0) {
-                lessonsContainer.innerHTML = '<div class="no-lessons">У преподавателя пока нет занятий</div>';
-                return;
-            }
-
-            const daysOrder = ['Понедельник', 'Вторник', 'Среда', 'Четверг', 'Пятница', 'Суббота'];
-            const lessonsByDay = {};
-
-            lessons.forEach(lesson => {
-                if (!lessonsByDay[lesson.day]) lessonsByDay[lesson.day] = [];
-                lessonsByDay[lesson.day].push(lesson);
-            });
-
-            Object.keys(lessonsByDay).forEach(day => {
-                lessonsByDay[day].sort((a, b) => a.time.localeCompare(b.time));
-            });
-
-            let html = '';
-
-            daysOrder.forEach(day => {
-                if (!lessonsByDay[day]) return;
-
-                html += `<div class="lesson-day-divider">${day}</div>`;
-
-                lessonsByDay[day].forEach(lesson => {
-                    html += `
-                        <div class="lesson-card">
-                            <div class="lesson-card-header">
-                                <span class="lesson-group">${escapeHtml(lesson.groupName)}</span>
-                                <span class="lesson-time">${escapeHtml(lesson.time)}</span>
-                            </div>
-                            <div class="lesson-card-body">
-                                <div class="lesson-subject">${escapeHtml(lesson.subjectName)}</div>
-                                <div class="lesson-details">
-                                    <span class="lesson-detail-item">${escapeHtml(lesson.typeLesson)}</span>
-                                    <span class="lesson-detail-item">${escapeHtml(lesson.lessonFormat)}</span>
-                                    <span class="lesson-detail-item">${escapeHtml(lesson.week)}</span>
-                                    <span class="lesson-detail-item">${escapeHtml(lesson.classroomName)}</span>
-                                </div>
-                            </div>
-                        </div>
-                    `;
-                });
-            });
-
-            lessonsContainer.innerHTML = html;
-        } catch (e) {
-            lessonsContainer.innerHTML = `<div class="no-lessons">Ошибка загрузки: ${escapeHtml(e.message)}</div>`;
-            console.error('Ошибка загрузки занятий:', e);
-        }
-    }
-
-    function openViewLessonsModal(teacherId, teacherName) {
-        currentLessonsTeacherId = teacherId;
-        currentLessonsTeacherName = teacherName || '';
-
-        if (modalViewLessons) modalViewLessons.style.display = '';
-        loadTeacherLessons(teacherId, teacherName);
-    }
-
-    function closeViewLessonsModal() {
-        if (modalViewLessons) modalViewLessons.style.display = 'none';
-        currentLessonsTeacherId = null;
-        currentLessonsTeacherName = '';
-    }
-
-    document.addEventListener('keydown', (e) => {
-        if (e.key !== 'Escape') return;
-        if (usersOverlay?.classList.contains('open')) {
-            closeOverlay();
-        }
-    });
-
-    // =========================================================
-    // ЕДИНЫЙ обработчик кликов по таблице (ВАЖНО: без дубля)
-    // =========================================================
     usersTbody.addEventListener('click', async (e) => {
         const deleteBtn = e.target.closest('.btn-delete');
-        if (deleteBtn) {
-            if (!confirm('Удалить пользователя?')) return;
-            try {
-                await api.delete('/api/users/' + deleteBtn.dataset.id);
-                loadUsers();
-            } catch (err) {
-                alert(err.message || 'Ошибка удаления');
-            }
-            return;
-        }
+        if (!deleteBtn) return;
 
-        const addLessonBtn = e.target.closest('.btn-add-lesson');
-        if (addLessonBtn) {
-            e.preventDefault();
-
-            const teacherId = addLessonBtn.dataset.id;
-            const teacherName = addLessonBtn.dataset.name;
-
-            openAddLessonModal(teacherId);
-            openViewLessonsModal(teacherId, teacherName);
-
-            return;
-        }
-
-        const viewLessonsBtn = e.target.closest('.btn-view-lessons');
-        if (viewLessonsBtn) {
-            e.preventDefault();
-            const teacherId = viewLessonsBtn.dataset.id;
-            const teacherName = viewLessonsBtn.dataset.name;
-            openViewLessonsModal(teacherId, teacherName);
-            return;
+        if (!confirm('Удалить пользователя?')) return;
+        try {
+            await api.delete('/api/users/' + deleteBtn.dataset.id);
+            loadUsers();
+        } catch (err) {
+            alert(err.message || 'Ошибка удаления');
         }
     });
+
+    await loadUsers();
 }