From f7fb524bb00333aff7c684d49c7933fea688f989 Mon Sep 17 00:00:00 2001
From: alekan <kurskiysasha311@gmail.com>
Date: Fri, 20 Mar 2026 00:27:01 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=BE=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=20=D0=B3=D1=80=D1=83=D0=BF=D0=BF=20=D0=B8=20=D0=BE=D1=82?=
 =?UTF-8?q?=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B2=D1=8B=D1=85=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5?=
 =?UTF-8?q?=D1=82=D1=80=D0=BE=D0=B2=20=D0=B3=D1=80=D1=83=D0=BF=D0=BF=20?=
 =?UTF-8?q?=D0=B2=20=D1=82=D0=B0=D0=B1=D0=BB=D0=B8=D1=86=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/admin/js/views/groups.js | 22 +++++++++++++++++-----
 frontend/admin/views/groups.html  | 12 +++++++++++-
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/frontend/admin/js/views/groups.js b/frontend/admin/js/views/groups.js
index 17301b5..cd23644 100755
--- a/frontend/admin/js/views/groups.js
+++ b/frontend/admin/js/views/groups.js
@@ -17,7 +17,7 @@ export async function initGroups() {
             populateEfSelects(educationForms);
             await loadGroups();
         } catch (e) {
-            groupsTbody.innerHTML = '<tr><td colspan="4" class="loading-row">Ошибка загрузки данных</td></tr>';
+            groupsTbody.innerHTML = '<tr><td colspan="7" class="loading-row">Ошибка загрузки данных</td></tr>';
         }
     }
 
@@ -26,7 +26,7 @@ export async function initGroups() {
             allGroups = await api.get('/api/groups');
             applyGroupFilter();
         } catch (e) {
-            groupsTbody.innerHTML = '<tr><td colspan="4" class="loading-row">Ошибка загрузки</td></tr>';
+            groupsTbody.innerHTML = '<tr><td colspan="7" class="loading-row">Ошибка загрузки</td></tr>';
         }
     }
 
@@ -61,7 +61,7 @@ export async function initGroups() {
 
     function renderGroups(groups) {
         if (!groups || !groups.length) {
-            groupsTbody.innerHTML = '<tr><td colspan="4" class="loading-row">Нет групп</td></tr>';
+            groupsTbody.innerHTML = '<tr><td colspan="7" class="loading-row">Нет групп</td></tr>';
             return;
         }
         groupsTbody.innerHTML = groups.map(g => `
@@ -70,6 +70,8 @@ export async function initGroups() {
         <td>${escapeHtml(g.name)}</td>
         <td>${escapeHtml(g.groupSize)}</td>
         <td><span class="badge badge-ef">${escapeHtml(g.educationFormName)}</span></td>
+        <td>${g.departmentId || '-'}</td>
+        <td>${g.course || '-'}</td>
         <td><button class="btn-delete" data-id="${g.id}">Удалить</button></td>
       </tr>`).join('');
     }
@@ -80,14 +82,24 @@ export async function initGroups() {
         const name = document.getElementById('new-group-name').value.trim();
         const groupSize = document.getElementById('new-group-size').value;
         const educationFormId = newGroupEfSelect.value;
+        const departmentId = document.getElementById('new-group-department').value;
+        const course = document.getElementById('new-group-course').value;
 
         if (!name) { showAlert('create-group-alert', 'Введите название группы', 'error'); return; }
         if (!groupSize) { showAlert('create-group-alert', 'Введите размер группы', 'error'); return; }
         if (!educationFormId) { showAlert('create-group-alert', 'Выберите форму обучения', 'error'); return; }
+        if (!departmentId) { showAlert('create-group-alert', 'Введите ID кафедры', 'error'); return; }
+        if (!course) { showAlert('create-group-alert', 'Введите курс', 'error'); return; }
 
         try {
-            const data = await api.post('/api/groups', { name, groupSize, educationFormId: Number(educationFormId) });
-            showAlert('create-group-alert', `Группа "${escapeHtml(data.name)}" создана`, 'success');
+            const data = await api.post('/api/groups', { 
+                name, 
+                groupSize: Number(groupSize), 
+                educationFormId: Number(educationFormId),
+                departmentId: Number(departmentId),
+                course: Number(course)
+            });
+            showAlert('create-group-alert', `Группа "${escapeHtml(data.name || name)}" создана`, 'success');
             createGroupForm.reset();
             loadGroups();
         } catch (e) {
diff --git a/frontend/admin/views/groups.html b/frontend/admin/views/groups.html
index 5944cdc..ae7880b 100755
--- a/frontend/admin/views/groups.html
+++ b/frontend/admin/views/groups.html
@@ -17,6 +17,14 @@
                     <option value="">Загрузка...</option>
                 </select>
             </div>
+            <div class="form-group">
+                <label for="new-group-department">ID кафедры</label>
+                <input type="number" id="new-group-department" placeholder="ID" required>
+            </div>
+            <div class="form-group">
+                <label for="new-group-course">Курс</label>
+                <input type="number" id="new-group-course" placeholder="1-6" min="1" max="6" required>
+            </div>
             <button type="submit" class="btn-primary">Создать</button>
         </div>
         <div class="form-alert" id="create-group-alert" role="alert"></div>
@@ -41,12 +49,14 @@
                     <th>Название</th>
                     <th>Численность (чел.)</th>
                     <th>Форма обучения</th>
+                    <th>ID кафедры</th>
+                    <th>Курс</th>
                     <th>Действия</th>
                 </tr>
             </thead>
             <tbody id="groups-tbody">
                 <tr>
-                    <td colspan="4" class="loading-row">Загрузка...</td>
+                    <td colspan="7" class="loading-row">Загрузка...</td>
                 </tr>
             </tbody>
         </table>