From 9bd21757d67fcac4f602f4e282a9468799965c53 Mon Sep 17 00:00:00 2001
From: ProstoDenya01 <patrikeev.denya@gmail.com>
Date: Wed, 4 Mar 2026 23:31:42 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20?=
 =?UTF-8?q?=D1=82=D0=B0=D0=B1=D0=BB=D0=B8=D1=86=D1=83=20=D0=B2=D1=8B=D0=B2?=
 =?UTF-8?q?=D0=BE=D0=B4=D0=B0=20=D0=B7=D0=B0=D0=BD=D1=8F=D1=82=D0=B8=D0=B9?=
 =?UTF-8?q?=20=D0=BD=D0=B0=20FE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/admin/js/views/schedule.js | 12 ++++++++++++
 frontend/admin/views/schedule.html  |  9 +++++++++
 2 files changed, 21 insertions(+)

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() {
                 <td>${escapeHtml(lesson.id)}</td>
                 <td>${escapeHtml(teacherName)}</td>
                 <td>${escapeHtml(groupName)}</td>
+                <td>${escapeHtml(classroomName)}</td>
                 <td>${escapeHtml(educationForm)}</td>
                 <td>${escapeHtml(subjectName)}</td>
+                <td>${escapeHtml(lessonFormat)}</td>
+                <td>${escapeHtml(typeLesson)}</td>
                 <td>${escapeHtml(day)}</td>
                 <td>${escapeHtml(week)}</td>
                 <td>${escapeHtml(time)}</td>
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 @@
                     <th class="filterable" data-filter-key="group">
                         Группа <span class="filter-icon">&#9662;</span>
                     </th>
+                    <th class="filterable" data-filter-key="classroomName">
+                        Аудитория <span class="filter-icon">&#9662;</span>
+                    </th>
                     <th class="filterable" data-filter-key="educationForm">
                         Форма обучения <span class="filter-icon">&#9662;</span>
                     </th>
                     <th class="filterable" data-filter-key="subject">
                         Дисциплина <span class="filter-icon">&#9662;</span>
                     </th>
+                    <th class="filterable" data-filter-key="lessonFormat">
+                        Формат занятия <span class="filter-icon">&#9662;</span>
+                    </th>
+                    <th class="filterable" data-filter-key="typeLesson">
+                        Тип занятия <span class="filter-icon">&#9662;</span>
+                    </th>
                     <th class="filterable" data-filter-key="day">
                         День недели <span class="filter-icon">&#9662;</span>
                     </th>