баг-фикс 30/34

frontend/admin/js/views/academic-calendar.js

@@ -801,7 +801,7 @@ export async function initAcademicCalendar() {
         const cellByWeekAndDay = new Map(rows.map(row => [`${row.weekNumber}:${row.dayOfWeek}`, row]));
         return `
             <div class="calendar-semester-table-wrap">
-                <table class="calendar-semester-table" style="--calendar-week-columns:${weekSlots.length}; --calendar-min-table-width:${32 + weekSlots.length * 22}px">
+                <table class="calendar-semester-table">
                     <colgroup>
                         <col class="calendar-day-head-col">
                         ${weekSlots.map(() => '<col class="calendar-week-col">').join('')}
@@ -842,7 +842,6 @@ export async function initAcademicCalendar() {
         const dayName = shortDayLabel(row.dayOfWeek);
         const activity = activityById(selected) || activityTypes[0] || {};
         const code = activity.code || row.activityCode || 'Т';
-        const color = activity.colorCode || '#64748b';
         return `
             <td class="calendar-day"
                  data-course="${row.courseNumber}"
@@ -853,8 +852,7 @@ export async function initAcademicCalendar() {
                  data-time-scope-id="${timeAssignmentForDate(row.date)?.scopeId || ''}"
                  role="button"
                  tabindex="0"
-                 aria-label="${escapeHtml(`${formatShortDate(row.date)} ${dayName}, ${row.weekNumber} неделя, код ${code}`)}"
-                 style="--activity-color:${escapeHtml(color)}">
+                 aria-label="${escapeHtml(`${formatShortDate(row.date)} ${dayName}, ${row.weekNumber} неделя, код ${code}`)}">
                 <strong class="calendar-day-code">${escapeHtml(code)}</strong>
                 ${timeAssignmentForDate(row.date) ? '<span class="calendar-day-time-marker">вр.</span>' : ''}
                 <select class="calendar-day-activity custom-select-initialized" aria-hidden="true" tabindex="-1">${options(activityTypes.map(toActivityOption), selected)}</select>
@@ -921,7 +919,7 @@ export async function initAcademicCalendar() {
             return;
         }
         calendarDayDialogActivitySummary.innerHTML = `
-            <span class="calendar-day-dialog-code" style="--activity-color:${escapeHtml(activity.colorCode || '#64748b')}">${escapeHtml(activity.code)}</span>
+            <span class="calendar-day-dialog-code">${escapeHtml(activity.code)}</span>
             <div>
                 <strong>${escapeHtml(activity.name)}</strong>
                 <p>${escapeHtml(activity.description || (activity.allowSchedule ? 'Обычные пары разрешены' : 'Обычные пары не генерируются'))}</p>
@@ -938,7 +936,7 @@ export async function initAcademicCalendar() {
         const activity = activityById(commonCalendarDayActivityValue(days));
         if (!activity) {
             calendarDayDialogActivitySummary.innerHTML = `
-                <span class="calendar-day-dialog-code" style="--activity-color:#64748b">...</span>
+                <span class="calendar-day-dialog-code">...</span>
                 <div>
                     <strong>Выбрано ячеек: ${days.length}</strong>
                     <p>Выберите код активности, чтобы применить его ко всему выделению</p>
@@ -948,7 +946,7 @@ export async function initAcademicCalendar() {
         }
 
         calendarDayDialogActivitySummary.innerHTML = `
-            <span class="calendar-day-dialog-code" style="--activity-color:${escapeHtml(activity.colorCode || '#64748b')}">${escapeHtml(activity.code)}</span>
+            <span class="calendar-day-dialog-code">${escapeHtml(activity.code)}</span>
             <div>
                 <strong>${escapeHtml(activity.name)} · ${days.length} ячеек</strong>
                 <p>${escapeHtml(activity.description || (activity.allowSchedule ? 'Обычные пары разрешены' : 'Обычные пары не генерируются'))}</p>
@@ -1041,8 +1039,6 @@ export async function initAcademicCalendar() {
         const select = day.querySelector('.calendar-day-activity');
         const activity = activityById(select.value);
         const code = activity?.code || '-';
-        const color = activity?.colorCode || '#64748b';
-        day.style.setProperty('--activity-color', color);
         day.querySelector('.calendar-day-code').textContent = code;
         day.setAttribute('aria-label', `${formatShortDate(day.dataset.date)} ${shortDayLabel(day.dataset.day)}, ${day.dataset.week} неделя, код ${code}`);
     }
@@ -1053,11 +1049,8 @@ export async function initAcademicCalendar() {
             return;
         }
         const tooltip = ensureCalendarDayTooltip();
-        const activity = activityById(day.querySelector('.calendar-day-activity')?.value);
-        tooltip.style.setProperty('--activity-color', activity?.colorCode || '#64748b');
         tooltip.innerHTML = renderCalendarDayTooltip(day);
         tooltip.classList.add('visible');
-        positionCalendarDayTooltip(tooltip, day, event);
     }
 
     function hideCalendarDayTooltip() {
@@ -1076,14 +1069,13 @@ export async function initAcademicCalendar() {
     function renderCalendarDayTooltip(day) {
         const activity = activityById(day.querySelector('.calendar-day-activity')?.value);
         const code = activity?.code || day.querySelector('.calendar-day-code')?.textContent || '-';
-        const color = activity?.colorCode || '#64748b';
         const timeAssignment = timeAssignmentForDate(day.dataset.date);
         const timeLabel = timeAssignment
             ? (timeSlotScopes.find(scope => String(scope.id) === String(timeAssignment.scopeId))?.name || 'ручная сетка')
             : automaticTimeScopeLabel(day.dataset.date).replace('По правилу даты ', '');
         return `
             <div class="calendar-day-tooltip-head">
-                <span class="calendar-day-tooltip-code" style="--activity-color:${escapeHtml(color)}"><span>${escapeHtml(code)}</span></span>
+                <span class="calendar-day-tooltip-code"><span>${escapeHtml(code)}</span></span>
                 <div>
                     <strong>${escapeHtml(formatLongDate(day.dataset.date))}</strong>
                     <span>${escapeHtml(shortDayLabel(day.dataset.day))}, ${escapeHtml(day.dataset.week)} неделя</span>
@@ -1106,24 +1098,6 @@ export async function initAcademicCalendar() {
         `;
     }
 
-    function positionCalendarDayTooltip(tooltip, day, event) {
-        const offset = 14;
-        const rect = day.getBoundingClientRect();
-        const x = event?.clientX ?? rect.left + rect.width / 2;
-        const y = event?.clientY ?? rect.top;
-        const tooltipRect = tooltip.getBoundingClientRect();
-        let left = x + offset;
-        let top = y + offset;
-        if (left + tooltipRect.width > window.innerWidth - 12) {
-            left = x - tooltipRect.width - offset;
-        }
-        if (top + tooltipRect.height > window.innerHeight - 12) {
-            top = y - tooltipRect.height - offset;
-        }
-        tooltip.style.left = `${Math.max(12, left)}px`;
-        tooltip.style.top = `${Math.max(12, top)}px`;
-    }
-
     function startCalendarDayDragSelection(event, day) {
         if (event.button !== 0) return;
         hideCalendarDayTooltip();
@@ -1246,10 +1220,9 @@ export async function initAcademicCalendar() {
         calendarTotals.innerHTML = Array.from(counts.entries())
             .sort(([a], [b]) => a.localeCompare(b, 'ru'))
             .map(([code, count]) => {
-                const activity = activityTypes.find(item => item.code === code);
                 const selectedClass = selectedCode === code ? ' is-selected' : '';
                 const suffix = selectedCode === code ? '<span class="calendar-total-selected">выбрано</span>' : '';
-                return `<span class="calendar-total-chip${selectedClass}" style="--chip-color:${escapeHtml(activity?.colorCode || '#64748b')}">${escapeHtml(code)}: ${count}${suffix}</span>`;
+                return `<span class="calendar-total-chip${selectedClass}">${escapeHtml(code)}: ${count}${suffix}</span>`;
             }).join('');
     }