diff --git a/frontend/admin/js/views/schedule.js b/frontend/admin/js/views/schedule.js index 5312a3b..03c2950 100755 --- a/frontend/admin/js/views/schedule.js +++ b/frontend/admin/js/views/schedule.js @@ -232,10 +232,16 @@ export async function initSchedule() { return (lesson.teacher?.username || lesson.teacherName || '').toLowerCase(); case 'group': return (lesson.group?.name || lesson.groupName || '').toLowerCase(); + case 'classroomName': + return (lesson.classroomName?.name || lesson.classroomName || '').toLowerCase(); case 'educationForm': return (lesson.educationForm?.name || lesson.educationFormName || '').toLowerCase(); case 'subject': return (lesson.subject?.name || lesson.subjectName || '').toLowerCase(); + case 'lessonFormat': + return (lesson.lessonFormat?.name || lesson.lessonFormat || '').toLowerCase(); + case 'typeLesson': + return (lesson.typeLesson?.name || lesson.typeLesson || '').toLowerCase(); case 'day': { const d = (lesson.day || '').toLowerCase(); return dayOrder[d] ?? 99; @@ -335,8 +341,11 @@ export async function initSchedule() { tbody.innerHTML = sorted.map(lesson => { const teacherName = lesson.teacher?.username || lesson.teacherName || '—'; const groupName = lesson.group?.name || lesson.groupName || '—'; + const classroomName = lesson.classroom?.name || lesson.classroomName || '—'; const educationForm = lesson.educationForm?.name || lesson.educationFormName || '-'; const subjectName = lesson.subject?.name || lesson.subjectName || '—'; + const lessonFormat = lesson.lessonFormat?.name || lesson.lessonFormat || '—'; + const typeLesson = lesson.typeLesson?.name || lesson.typeLesson || '—'; const day = lesson.day || '—'; const week = lesson.week || '—'; const time = lesson.time || '—'; @@ -345,8 +354,11 @@ export async function initSchedule() { ${escapeHtml(lesson.id)} ${escapeHtml(teacherName)} ${escapeHtml(groupName)} + ${escapeHtml(classroomName)} ${escapeHtml(educationForm)} ${escapeHtml(subjectName)} + ${escapeHtml(lessonFormat)} + ${escapeHtml(typeLesson)} ${escapeHtml(day)} ${escapeHtml(week)} ${escapeHtml(time)} diff --git a/frontend/admin/views/schedule.html b/frontend/admin/views/schedule.html index 1ee1ce0..35d4701 100755 --- a/frontend/admin/views/schedule.html +++ b/frontend/admin/views/schedule.html @@ -11,12 +11,21 @@ Группа + + Аудитория + Форма обучения Дисциплина + + Формат занятия + + + Тип занятия + День недели