- |
- Время
- Дата
- |
- ${slots.map(renderSlotHeader).join('')}
+ Время |
+ ${dayHeaders}
${rows}
@@ -110,23 +170,107 @@ export async function initScheduleView() {
`;
}
- function renderSlotHeader(slot) {
+ function renderDayParityDate(date, label) {
+ return `${escapeHtml(label)}: ${date ? escapeHtml(formatDateShort(date)) : '-'}`;
+ }
+
+ function renderCombinedSlotCell(datesByParity, slot, lessonsByDateSlot) {
+ const states = CELL_PARITY_LAYOUT.map(({ parity, label }) => ({
+ parity,
+ label,
+ state: scheduleSlotState(datesByParity[parity], slot, lessonsByDateSlot)
+ }));
+
+ if (slotStatesEqual(states[0].state, states[1].state)) {
+ return `${renderUnifiedSlot(states[0].state)} | `;
+ }
+
+ const halves = states.map(({ parity, label, state }) =>
+ renderSlotHalf(state, parity, label)
+ ).join('');
+ return `${halves} | `;
+ }
+
+ function scheduleSlotState(date, slot, lessonsByDateSlot) {
+ if (!date) {
+ return { kind: 'empty', lessons: [] };
+ }
+ const lessons = lessonsByDateSlot.get(dateSlotKey(date, slot.key)) || [];
+ if (lessons.length) {
+ return { kind: 'busy', lessons };
+ }
+ return { kind: 'free', lessons: [] };
+ }
+
+ function renderUnifiedSlot(state) {
+ if (state.kind === 'busy') {
+ return `${state.lessons.map(renderLessonCard).join('')}
`;
+ }
+ if (state.kind === 'empty') {
+ return 'Нет даты
';
+ }
+ return 'Нет занятий
';
+ }
+
+ function renderSlotHalf(state, parity, label) {
+ if (state.kind === 'busy') {
+ return `
+
+ ${escapeHtml(label)}
+ ${state.lessons.map(renderLessonCard).join('')}
+
+ `;
+ }
+ if (state.kind === 'empty') {
+ return `
+
+ ${escapeHtml(label)}
+ Нет даты
+
+ `;
+ }
return `
-
- ${escapeHtml(slot.orderLabel)}
- ${escapeHtml(slot.timeLabel)}
- ${slot.id ? `ID ${escapeHtml(slot.id)}` : ''}
- |
+
+ ${escapeHtml(label)}
+ Нет занятий
+
`;
}
- function renderSlotCell(date, slot, lessonsByDateSlot) {
- const lessons = lessonsByDateSlot.get(dateSlotKey(date, slot.key)) || [];
- return `
-
- ${lessons.length ? lessons.map(renderLessonCard).join('') : 'Свободно'}
- |
- `;
+ function slotStatesEqual(first, second) {
+ if (first.kind !== second.kind) return false;
+ if (first.kind !== 'busy') return true;
+ return lessonSetSignature(first.lessons) === lessonSetSignature(second.lessons);
+ }
+
+ function lessonSetSignature(lessons) {
+ return lessons
+ .map(lessonContentSignature)
+ .sort((a, b) => naturalCompare(a, b))
+ .join('|');
+ }
+
+ function lessonContentSignature(lesson) {
+ return [
+ lesson.scheduleRuleSlotId || lesson.scheduleRuleId || '',
+ lesson.subjectId || lesson.subjectName || '',
+ lesson.teacherId || lesson.teacherName || '',
+ lesson.classroomId || lesson.classroomName || '',
+ lesson.lessonTypeId || lesson.lessonTypeName || '',
+ lesson.lessonFormat || '',
+ valueListSignature(lesson.groupIds, lesson.groupNames),
+ valueListSignature(lesson.subgroupIds, lesson.subgroupNames)
+ ].join(':');
+ }
+
+ function valueListSignature(primary = [], fallback = []) {
+ const primaryList = Array.isArray(primary) ? primary : [];
+ const fallbackList = Array.isArray(fallback) ? fallback : [];
+ const source = primaryList.length ? primaryList : fallbackList;
+ return [...source]
+ .map(value => String(value))
+ .sort((a, b) => naturalCompare(a, b))
+ .join(',');
}
function renderLessonCard(lesson) {
@@ -178,12 +322,9 @@ async function loadDictionaries(role, userDepartmentId) {
}
}
-function setDefaultDates(startInput, endInput) {
+function setDefaultDate(dateInput) {
const today = new Date();
- const nextWeek = new Date();
- nextWeek.setDate(today.getDate() + 7);
- startInput.value = toIsoDate(today);
- endInput.value = toIsoDate(nextWeek);
+ dateInput.value = toIsoDate(today);
}
function fillSelect(id, items, valueFn, labelFn, emptyLabel) {
@@ -205,14 +346,6 @@ function roomLabel(room) {
return [room.name, room.building, room.floor ? `${room.floor} этаж` : null].filter(Boolean).join(' · ');
}
-function formatSlot(lesson) {
- const order = lesson.timeSlotOrder ? `${lesson.timeSlotOrder} пара` : 'Пара';
- const time = lesson.startTime && lesson.endTime
- ? ` (${trimTime(lesson.startTime)}-${trimTime(lesson.endTime)})`
- : '';
- return `${order}${time}`;
-}
-
function collectSlots(lessons) {
const slots = new Map();
lessons.forEach(lesson => {
@@ -252,35 +385,159 @@ function groupLessonsByDateSlot(lessons) {
return grouped;
}
-function groupDatesByWeek(dates) {
- const groups = new Map();
- Array.from(new Set(dates.filter(Boolean)))
- .sort((a, b) => naturalCompare(a, b))
- .forEach(date => {
- const key = weekStart(date);
- if (!groups.has(key)) groups.set(key, []);
- groups.get(key).push(date);
+function buildScheduleSections(lessons) {
+ const splitType = resolveSplitType();
+ const sections = new Map();
+
+ lessons.forEach(lesson => {
+ splitEntitiesForLesson(lesson, splitType).forEach(entity => {
+ if (!sections.has(entity.key)) {
+ sections.set(entity.key, {
+ key: entity.key,
+ title: entity.title,
+ lessons: []
+ });
+ }
+ sections.get(entity.key).lessons.push(lesson);
});
- return Array.from(groups.entries()).map(([startDate, weekDates]) => ({
- startDate,
- dates: weekDates,
- label: `Неделя ${formatDate(startDate)} - ${formatDate(addDaysToIso(startDate, 6))}`
- }));
+ });
+
+ return Array.from(sections.values())
+ .map(section => ({
+ ...section,
+ lessons: sortLessons(section.lessons)
+ }))
+ .sort((a, b) => naturalCompare(a.title, b.title));
}
-function dayTitle(date, lessonsByDateSlot) {
- for (const [key, lessons] of lessonsByDateSlot.entries()) {
- if (key.startsWith(`${date}:`) && lessons[0]?.dayName) {
- return lessons[0].dayName;
- }
+function resolveSplitType() {
+ const requested = valueOf('schedule-view-split');
+ if ([SPLIT_GROUPS, SPLIT_TEACHERS, SPLIT_CLASSROOMS].includes(requested)) {
+ return requested;
}
- return dayName(date);
+ if (valueOf('schedule-view-teacher')) return SPLIT_TEACHERS;
+ if (valueOf('schedule-view-classroom')) return SPLIT_CLASSROOMS;
+ return SPLIT_GROUPS;
}
-function weekCaption(dates) {
- const first = dates[0];
- const last = dates[dates.length - 1];
- return `${formatDate(first)} - ${formatDate(last)}`;
+function splitEntitiesForLesson(lesson, splitType) {
+ if (splitType === SPLIT_TEACHERS) {
+ return [singleEntity('teacher', lesson.teacherId, lesson.teacherName, 'Преподаватель не указан')];
+ }
+ if (splitType === SPLIT_CLASSROOMS) {
+ return [singleEntity('classroom', lesson.classroomId, lesson.classroomName, 'Аудитория не указана')];
+ }
+ return listEntities('group', lesson.groupIds, lesson.groupNames, 'Группа не указана');
+}
+
+function singleEntity(prefix, id, name, fallback) {
+ const title = name || fallback;
+ return {
+ key: `${prefix}:${id ?? title}`,
+ title
+ };
+}
+
+function listEntities(prefix, ids = [], names = [], fallback) {
+ const safeIds = Array.isArray(ids) ? ids : [];
+ const safeNames = Array.isArray(names) ? names : [];
+ if (!safeIds.length && !safeNames.length) {
+ return [singleEntity(prefix, null, fallback, fallback)];
+ }
+ const maxLength = Math.max(safeIds.length, safeNames.length);
+ const entities = [];
+ for (let index = 0; index < maxLength; index += 1) {
+ const id = safeIds[index] ?? null;
+ const name = safeNames[index] || (id == null ? fallback : `Группа ${id}`);
+ entities.push(singleEntity(prefix, id, name, fallback));
+ }
+ return entities;
+}
+
+function sortLessons(lessons) {
+ return [...lessons].sort((a, b) =>
+ naturalCompare(a.date, b.date)
+ || compareSlots(lessonSlotDescriptor(a), lessonSlotDescriptor(b))
+ || naturalCompare(a.subjectName, b.subjectName)
+ || naturalCompare(a.teacherName, b.teacherName)
+ || naturalCompare(a.classroomName, b.classroomName)
+ );
+}
+
+function lessonSlotDescriptor(lesson) {
+ return {
+ key: lessonSlotKey(lesson),
+ orderNumber: lesson.timeSlotOrder,
+ startTime: lesson.startTime
+ };
+}
+
+function buildCombinedWeekBlocks(startDate, endDate, lessons) {
+ const dates = datesBetween(startDate, endDate);
+ const weekGroups = new Map();
+ dates.forEach(date => {
+ const key = weekStart(date);
+ if (!weekGroups.has(key)) weekGroups.set(key, []);
+ weekGroups.get(key).push(date);
+ });
+
+ const weekStarts = Array.from(weekGroups.keys()).sort((a, b) => naturalCompare(a, b));
+ const blocks = [];
+ for (let index = 0; index < weekStarts.length; index += 2) {
+ const firstWeek = weekGroups.get(weekStarts[index]) || [];
+ const secondWeek = weekGroups.get(weekStarts[index + 1]) || [];
+ const blockDates = [...firstWeek, ...secondWeek];
+ const firstParity = weekParity(firstWeek, lessons) || 'ODD';
+ const secondParity = weekParity(secondWeek, lessons) || (firstParity === 'ODD' ? 'EVEN' : 'ODD');
+ const datesWithFallback = [
+ ...firstWeek.map(date => ({ date, fallbackParity: firstParity })),
+ ...secondWeek.map(date => ({ date, fallbackParity: secondParity }))
+ ];
+ blocks.push({
+ startDate: blockDates[0],
+ endDate: blockDates[blockDates.length - 1],
+ datesByDay: buildDatesByDay(datesWithFallback, lessons),
+ label: `Период ${formatDate(blockDates[0])} - ${formatDate(blockDates[blockDates.length - 1])}`
+ });
+ }
+ return blocks;
+}
+
+function weekParity(dates, lessons) {
+ for (const date of dates) {
+ const parity = parityForDate(date, lessons);
+ if (parity) return parity;
+ }
+ return null;
+}
+
+function buildDatesByDay(datesWithFallback, lessons) {
+ const datesByDay = {};
+ datesWithFallback.forEach(({ date, fallbackParity }) => {
+ const day = isoDay(date);
+ const parity = parityForDate(date, lessons) || fallbackParity;
+ if (!datesByDay[day]) datesByDay[day] = {};
+ datesByDay[day][parity] = date;
+ });
+ return datesByDay;
+}
+
+function parityForDate(date, lessons) {
+ const lesson = lessons.find(item => item.date === date && ['ODD', 'EVEN'].includes(item.parity));
+ if (lesson?.parity) return lesson.parity;
+ const withWeek = lessons.find(item => item.date === date && item.weekNumber != null);
+ if (withWeek?.weekNumber != null) return Number(withWeek.weekNumber) % 2 === 0 ? 'EVEN' : 'ODD';
+ return null;
+}
+
+function combinedWeekCaption(block) {
+ return CELL_PARITY_LAYOUT
+ .map(({ parity, label }) => {
+ const dates = DAY_ORDER.map(day => block.datesByDay[day]?.[parity]).filter(Boolean);
+ if (!dates.length) return `${label}: дат нет`;
+ return `${label}: ${formatDate(dates[0])} - ${formatDate(dates[dates.length - 1])}`;
+ })
+ .join('; ');
}
function lessonSlotKey(lesson) {
@@ -299,10 +556,20 @@ function weekStart(value) {
return toIsoDate(date);
}
-function addDaysToIso(value, days) {
- const date = parseIsoDate(value);
- date.setDate(date.getDate() + days);
- return toIsoDate(date);
+function twoWeekRange(value) {
+ const selected = parseIsoDate(value);
+ const start = addDays(selected, 1 - isoDay(value));
+ const end = addDays(start, 13);
+ return {
+ startDate: toIsoDate(start),
+ endDate: toIsoDate(end)
+ };
+}
+
+function addDays(date, days) {
+ const next = new Date(date);
+ next.setDate(next.getDate() + days);
+ return next;
}
function parseIsoDate(value) {
@@ -310,8 +577,21 @@ function parseIsoDate(value) {
return new Date(year, month - 1, day);
}
-function dayName(value) {
- return parseIsoDate(value).toLocaleDateString('ru-RU', { weekday: 'long' });
+function datesBetween(startDate, endDate) {
+ const dates = [];
+ for (let date = parseIsoDate(startDate); date <= parseIsoDate(endDate); date.setDate(date.getDate() + 1)) {
+ dates.push(toIsoDate(date));
+ }
+ return dates;
+}
+
+function isoDay(value) {
+ const day = parseIsoDate(value).getDay();
+ return day === 0 ? 7 : day;
+}
+
+function dayShort(dayOfWeek) {
+ return DAY_SHORT_LABELS[Number(dayOfWeek)] || '-';
}
function formatDate(value) {
@@ -320,6 +600,11 @@ function formatDate(value) {
return `${day}.${month}.${year}`;
}
+function formatDateShort(value) {
+ const [, month, day] = String(value).split('-');
+ return `${day}.${month}`;
+}
+
function trimTime(value) {
return String(value || '').slice(0, 5);
}
@@ -340,6 +625,14 @@ function lessonCountLabel(count) {
return `${count} занятий`;
}
+function tableCountLabel(count) {
+ const tail = count % 100;
+ if (tail >= 11 && tail <= 14) return `${count} таблиц`;
+ if (count % 10 === 1) return `${count} таблица`;
+ if ([2, 3, 4].includes(count % 10)) return `${count} таблицы`;
+ return `${count} таблиц`;
+}
+
function compareSlots(a, b) {
const first = Number(a.orderNumber || a.key);
const second = Number(b.orderNumber || b.key);
diff --git a/frontend/admin/views/schedule-view.html b/frontend/admin/views/schedule-view.html
index 2c93be6..4cec711 100644
--- a/frontend/admin/views/schedule-view.html
+++ b/frontend/admin/views/schedule-view.html
@@ -6,12 +6,8 @@