Zuev/magistr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Доделал таблицу вывода занятий на FE

Browse Source
This commit is contained in:
ProstoDenya01
2026-03-04 23:31:42 +03:00
parent 7a729a782d
commit 9bd21757d6
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
frontend/admin/js/views/schedule.js
View File

@@ -232,10 +232,16 @@ export async function initSchedule() {
return (lesson.teacher?.username || lesson.teacherName || '').toLowerCase(); return (lesson.teacher?.username || lesson.teacherName || '').toLowerCase();
case 'group': case 'group':
return (lesson.group?.name || lesson.groupName || '').toLowerCase(); return (lesson.group?.name || lesson.groupName || '').toLowerCase();
case 'classroomName':
return (lesson.classroomName?.name || lesson.classroomName || '').toLowerCase();
case 'educationForm': case 'educationForm':
return (lesson.educationForm?.name || lesson.educationFormName || '').toLowerCase(); return (lesson.educationForm?.name || lesson.educationFormName || '').toLowerCase();
case 'subject': case 'subject':
return (lesson.subject?.name || lesson.subjectName || '').toLowerCase(); 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': { case 'day': {
const d = (lesson.day || '').toLowerCase(); const d = (lesson.day || '').toLowerCase();
return dayOrder[d] ?? 99; return dayOrder[d] ?? 99;
@@ -335,8 +341,11 @@ export async function initSchedule() {
tbody.innerHTML = sorted.map(lesson => { tbody.innerHTML = sorted.map(lesson => {
const teacherName = lesson.teacher?.username || lesson.teacherName || '—'; const teacherName = lesson.teacher?.username || lesson.teacherName || '—';
const groupName = lesson.group?.name || lesson.groupName || '—'; const groupName = lesson.group?.name || lesson.groupName || '—';
const classroomName = lesson.classroom?.name || lesson.classroomName || '—';
const educationForm = lesson.educationForm?.name || lesson.educationFormName || '-'; const educationForm = lesson.educationForm?.name || lesson.educationFormName || '-';
const subjectName = lesson.subject?.name || lesson.subjectName || '—'; 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 day = lesson.day || '—';
const week = lesson.week || '—'; const week = lesson.week || '—';
const time = lesson.time || '—'; const time = lesson.time || '—';
@@ -345,8 +354,11 @@ export async function initSchedule() {
<td>${escapeHtml(lesson.id)}</td> <td>${escapeHtml(lesson.id)}</td>
<td>${escapeHtml(teacherName)}</td> <td>${escapeHtml(teacherName)}</td>
<td>${escapeHtml(groupName)}</td> <td>${escapeHtml(groupName)}</td>
<td>${escapeHtml(classroomName)}</td>
<td>${escapeHtml(educationForm)}</td> <td>${escapeHtml(educationForm)}</td>
<td>${escapeHtml(subjectName)}</td> <td>${escapeHtml(subjectName)}</td>
<td>${escapeHtml(lessonFormat)}</td>
<td>${escapeHtml(typeLesson)}</td>
<td>${escapeHtml(day)}</td> <td>${escapeHtml(day)}</td>
<td>${escapeHtml(week)}</td> <td>${escapeHtml(week)}</td>
<td>${escapeHtml(time)}</td> <td>${escapeHtml(time)}</td>

9
frontend/admin/views/schedule.html
View File

@@ -11,12 +11,21 @@
<th class="filterable" data-filter-key="group"> <th class="filterable" data-filter-key="group">
Группа <span class="filter-icon">&#9662;</span> Группа <span class="filter-icon">&#9662;</span>
</th> </th>
<th class="filterable" data-filter-key="classroomName">
Аудитория <span class="filter-icon">&#9662;</span>
</th>
<th class="filterable" data-filter-key="educationForm"> <th class="filterable" data-filter-key="educationForm">
Форма обучения <span class="filter-icon">&#9662;</span> Форма обучения <span class="filter-icon">&#9662;</span>
</th> </th>
<th class="filterable" data-filter-key="subject"> <th class="filterable" data-filter-key="subject">
Дисциплина <span class="filter-icon">&#9662;</span> Дисциплина <span class="filter-icon">&#9662;</span>
</th> </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"> <th class="filterable" data-filter-key="day">
День недели <span class="filter-icon">&#9662;</span> День недели <span class="filter-icon">&#9662;</span>
</th> </th>