комит

frontend/admin/js/views/groups.js

@@ -1,5 +1,6 @@
 import { api } from '../api.js';
 import { escapeHtml, showAlert, hideAlert } from '../utils.js';
+import { buildAcademicCalendarTitle } from './academic-calendar-title.js';
 
 async function fetchEducationForms() {
     try {
@@ -384,7 +385,7 @@ export async function initGroups() {
             : [];
         manageCalendarSelect.innerHTML = matching.length
             ? '<option value="">Выберите график</option>' + matching.map(calendar =>
-                `<option value="${calendar.id}">${escapeHtml(calendar.title)}</option>`
+                `<option value="${calendar.id}">${escapeHtml(buildAcademicCalendarTitle(calendar) || '-')}</option>`
             ).join('')
             : '<option value="">Нет подходящих графиков</option>';
         syncSelects(manageCalendarSelect);
@@ -767,7 +768,7 @@ export async function initGroups() {
         manageCalendarTbody.innerHTML = currentAssignments.map(assignment => `
             <tr>
                 <td>${escapeHtml(assignment.academicYearTitle)}</td>
-                <td>${escapeHtml(assignment.calendarTitle)}</td>
+                <td>${escapeHtml(assignmentCalendarTitle(assignment))}</td>
                 <td>${renderAssignmentSubjects(assignment.subjects || [])}</td>
                 <td>
                     <button class="btn btn-sm btn-danger btn-delete-assignment" data-id="${assignment.id}">Удалить</button>
@@ -776,6 +777,13 @@ export async function initGroups() {
         `).join('');
     }
 
+    function assignmentCalendarTitle(assignment) {
+        const calendar = calendars.find(item =>
+            String(item.id) === String(assignment.calendarId)
+        );
+        return buildAcademicCalendarTitle(calendar) || assignment.calendarTitle || '-';
+    }
+
     function renderAssignmentSubjects(subjects) {
         if (!subjects.length) {
             return '<span class="muted">Не привязаны</span>';