исправил логику курса групп

frontend/admin/js/views/groups.js

@@ -88,7 +88,7 @@ export async function initGroups() {
             await loadGroups();
             await loadSubgroups();
         } catch (error) {
-            groupsTbody.innerHTML = `<tr><td colspan="9" class="loading-row">Ошибка загрузки данных: ${escapeHtml(error.message)}</td></tr>`;
+            groupsTbody.innerHTML = `<tr><td colspan="10" class="loading-row">Ошибка загрузки данных: ${escapeHtml(error.message)}</td></tr>`;
             subgroupsTbody.innerHTML = `<tr><td colspan="4" class="loading-row">Ошибка загрузки данных: ${escapeHtml(error.message)}</td></tr>`;
         }
     }
@@ -103,13 +103,13 @@ export async function initGroups() {
 
     async function loadGroups() {
         try {
-            allGroups = await api.get('/api/groups');
+            allGroups = await api.get('/api/groups?includeArchived=true');
             applyGroupFilter();
             populateGroupSelect();
             populateSubgroupGroupSelect();
             await loadAssignments();
         } catch (error) {
-            groupsTbody.innerHTML = `<tr><td colspan="9" class="loading-row">Ошибка загрузки: ${escapeHtml(error.message)}</td></tr>`;
+            groupsTbody.innerHTML = `<tr><td colspan="10" class="loading-row">Ошибка загрузки: ${escapeHtml(error.message)}</td></tr>`;
         }
     }
 
@@ -132,7 +132,7 @@ export async function initGroups() {
 
     function renderGroups(groups) {
         if (!groups || !groups.length) {
-            groupsTbody.innerHTML = '<tr><td colspan="9" class="loading-row">Нет групп</td></tr>';
+            groupsTbody.innerHTML = '<tr><td colspan="10" class="loading-row">Нет групп</td></tr>';
             return;
         }
         groupsTbody.innerHTML = groups.map(group => `
@@ -145,9 +145,12 @@ export async function initGroups() {
                 <td>${group.course || '-'}</td>
                 <td>${escapeHtml(specialityLabel(group.specialtyId || group.specialityCode))}</td>
                 <td>${escapeHtml(group.specialtyProfileName || '-')}</td>
+                <td><span class="badge ${statusBadgeClass(group)}">${escapeHtml(statusLabel(group))}</span></td>
                 <td style="text-align: right;">
                     <button class="btn-edit-classroom btn-edit-group" data-id="${group.id}">Изменить</button>
-                    <button class="btn-delete" data-id="${group.id}" style="margin-left: 0.5rem;">Удалить</button>
+                    ${group.status === 'ARCHIVED'
+                        ? `<button class="btn-restore-group" data-id="${group.id}" style="margin-left: 0.5rem;">Восстановить</button>`
+                        : `<button class="btn-delete" data-id="${group.id}" style="margin-left: 0.5rem;">Архивировать</button>`}
                 </td>
             </tr>
         `).join('');
@@ -232,24 +235,26 @@ export async function initGroups() {
 
     function populateGroupSelect() {
         const current = calendarGroupSelect.value;
+        const availableGroups = allGroups.filter(group => group.active);
         calendarGroupSelect.innerHTML = '<option value="">Выберите группу</option>' +
-            allGroups.map(group => `<option value="${group.id}">${escapeHtml(group.name)}</option>`).join('');
-        if (current && allGroups.some(group => String(group.id) === String(current))) {
+            availableGroups.map(group => `<option value="${group.id}">${escapeHtml(group.name)}</option>`).join('');
+        if (current && availableGroups.some(group => String(group.id) === String(current))) {
             calendarGroupSelect.value = current;
-        } else if (allGroups.length) {
-            calendarGroupSelect.value = String(allGroups[0].id);
+        } else if (availableGroups.length) {
+            calendarGroupSelect.value = String(availableGroups[0].id);
         }
         syncSelects(calendarGroupSelect);
     }
 
     function populateSubgroupGroupSelect() {
         const current = subgroupGroupSelect.value;
+        const availableGroups = allGroups.filter(group => group.active);
         subgroupGroupSelect.innerHTML = '<option value="">Выберите группу</option>' +
-            allGroups.map(group => `<option value="${group.id}">${escapeHtml(group.name)}</option>`).join('');
-        if (current && allGroups.some(group => String(group.id) === String(current))) {
+            availableGroups.map(group => `<option value="${group.id}">${escapeHtml(group.name)}</option>`).join('');
+        if (current && availableGroups.some(group => String(group.id) === String(current))) {
             subgroupGroupSelect.value = current;
-        } else if (allGroups.length) {
-            subgroupGroupSelect.value = String(allGroups[0].id);
+        } else if (availableGroups.length) {
+            subgroupGroupSelect.value = String(availableGroups[0].id);
         }
         syncSelects(subgroupGroupSelect);
     }
@@ -342,15 +347,26 @@ export async function initGroups() {
     async function handleGroupTableClick(event) {
         const btnDelete = event.target.closest('.btn-delete');
         const btnEdit = event.target.closest('.btn-edit-group');
+        const btnRestore = event.target.closest('.btn-restore-group');
 
         if (btnDelete) {
-            if (!confirm('Удалить группу?')) return;
+            if (!confirm('Архивировать группу? История расписания сохранится.')) return;
             try {
                 await api.delete('/api/groups/' + btnDelete.dataset.id);
                 await loadGroups();
                 await loadSubgroups();
             } catch (error) {
-                alert(error.message || 'Ошибка удаления');
+                alert(error.message || 'Ошибка архивирования');
+            }
+        }
+
+        if (btnRestore) {
+            try {
+                await api.post('/api/groups/' + btnRestore.dataset.id + '/restore', {});
+                await loadGroups();
+                await loadSubgroups();
+            } catch (error) {
+                alert(error.message || 'Ошибка восстановления');
             }
         }
 
@@ -566,6 +582,21 @@ export async function initGroups() {
         return name ? `${code} — ${name}` : code;
     }
 
+    function statusLabel(group) {
+        if (group.status === 'ARCHIVED') return 'Архив';
+        return group.studyStateName || (group.active ? 'Активна' : 'Неактивна');
+    }
+
+    function statusBadgeClass(group) {
+        if (group.status === 'ARCHIVED' || group.studyState === 'GRADUATED' || group.studyState === 'INACTIVE') {
+            return 'badge-unavailable';
+        }
+        if (group.studyState === 'NOT_STARTED') {
+            return 'badge-ef';
+        }
+        return 'badge-available';
+    }
+
     function syncSelects(...selects) {
         selects.filter(Boolean).forEach(select => {
             select.dispatchEvent(new Event('change', { bubbles: true }));

frontend/admin/views/groups.html

@@ -67,12 +67,13 @@
                     <th>Курс</th>
                     <th>Специальность</th>
                     <th>Профиль</th>
+                    <th>Статус</th>
                     <th>Действия</th>
                 </tr>
             </thead>
             <tbody id="groups-tbody">
                 <tr>
-                    <td colspan="9" class="loading-row">Загрузка...</td>
+                    <td colspan="10" class="loading-row">Загрузка...</td>
                 </tr>
             </tbody>
         </table>