Исправил часть косяков в конструкторе правил

frontend/admin/js/views/schedule-view.js

@@ -35,6 +35,7 @@ const CELL_PARITY_LAYOUT = [
     { parity: 'EVEN', label: 'Чётная' }
 ];
 const MOBILE_QUERY = '(max-width: 760px)';
+const DEFAULT_SEMESTER_WEEKS = 22;
 
 export async function initScheduleView() {
     const role = localStorage.getItem('role');
@@ -621,11 +622,43 @@ export async function initScheduleView() {
         
         if (startWeek <= 0) startWeek = 1;
         if (endWeek < startWeek) endWeek = startWeek;
-        
-        if (startWeek === endWeek) {
-            return `${startWeek} нед.`;
-        }
-        return `с ${startWeek} по ${endWeek} нед.`;
+
+        return formatLessonWeeksText(startWeek, endWeek, parity, semesterWeeksForLesson(lesson));
+    }
+
+    function formatLessonWeeksText(startWeek, endWeek, parity, semesterWeeks) {
+        const semesterEndWeek = lastApplicableSemesterWeek(semesterWeeks, parity);
+        const semesterStartWeek = firstApplicableSemesterWeek(parity);
+        if (semesterEndWeek && startWeek <= semesterStartWeek && endWeek >= semesterEndWeek) return '';
+        if (semesterEndWeek && endWeek >= semesterEndWeek) return `(с ${startWeek} нед.)`;
+        return startWeek === endWeek
+            ? `(${startWeek} нед.)`
+            : `(с ${startWeek} по ${endWeek} нед.)`;
+    }
+
+    function semesterWeeksForLesson(lesson) {
+        const semester = (state.dictionaries.semesters || []).find(item => dateInRange(lesson.date, item.startDate, item.endDate));
+        if (!semester?.startDate || !semester?.endDate) return DEFAULT_SEMESTER_WEEKS;
+        const start = parseIsoDate(semester.startDate);
+        const end = parseIsoDate(semester.endDate);
+        const days = Math.max(1, Math.round((end - start) / 86400000) + 1);
+        return Math.max(1, Math.ceil(days / 7));
+    }
+
+    function dateInRange(date, startDate, endDate) {
+        return Boolean(date && startDate && endDate && date >= startDate && date <= endDate);
+    }
+
+    function firstApplicableSemesterWeek(parity) {
+        return parity === 'EVEN' ? 2 : 1;
+    }
+
+    function lastApplicableSemesterWeek(maxWeeks, parity) {
+        const totalWeeks = Number(maxWeeks || 0);
+        if (!totalWeeks) return 0;
+        if (parity === 'ODD' && totalWeeks % 2 === 0) return totalWeeks - 1;
+        if (parity === 'EVEN' && totalWeeks % 2 !== 0) return totalWeeks - 1;
+        return totalWeeks;
     }
 
     function renderLessonCard(lesson) {
@@ -694,13 +727,14 @@ export async function initScheduleView() {
 }
 
 async function loadDictionaries(role, userDepartmentId) {
-    const [groups, teachers, classrooms, departments, subjects, lessonTypes] = await Promise.all([
+    const [groups, teachers, classrooms, departments, subjects, lessonTypes, academicYears] = await Promise.all([
         api.get('/api/groups'),
         api.get('/api/users/teachers'),
         api.get('/api/classrooms'),
         api.get('/api/departments'),
         api.get('/api/subjects'),
-        api.get('/api/lesson-types')
+        api.get('/api/lesson-types'),
+        api.get('/api/admin/calendar/years').catch(() => [])
     ]);
 
     const visibleGroups = role === ROLE_DEPARTMENT && userDepartmentId
@@ -718,7 +752,8 @@ async function loadDictionaries(role, userDepartmentId) {
         groups,
         teachers,
         classrooms,
-        departments
+        departments,
+        semesters: (academicYears || []).flatMap(year => year.semesters || [])
     };
 }