From 0c68702e8fba03a1fb763d44745e657275669070 Mon Sep 17 00:00:00 2001 From: Vladislav Kopnin Date: Tue, 27 Oct 2026 13:30:02 +0300 Subject: [PATCH] =?UTF-8?q?fix(web):=20=D0=B2=D0=BE=D1=81=D1=81=D1=82?= =?UTF-8?q?=D0=B0=D0=BD=D0=BE=D0=B2=D0=B8=D1=82=D1=8C=20=D1=81=D1=82=D0=B0?= =?UTF-8?q?=D1=82=D1=83=D1=81=20=D1=81=D1=82=D1=83=D0=B4=D0=B5=D0=BD=D1=82?= =?UTF-8?q?=D0=B0=20=D0=B2=20=D0=BC=D0=B0=D1=82=D1=80=D0=B8=D1=86=D0=B5=20?= =?UTF-8?q?=D0=B3=D1=80=D1=83=D0=BF=D0=BF=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/kotlin/ru/ysu/lms/web/admin/AdminGroupController.kt | 1 + web/src/main/kotlin/ru/ysu/lms/web/admin/AdminLabView.kt | 1 + web/src/main/resources/templates/admin/group.html | 2 +- web/src/main/resources/templates/admin/groups.html | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/web/src/main/kotlin/ru/ysu/lms/web/admin/AdminGroupController.kt b/web/src/main/kotlin/ru/ysu/lms/web/admin/AdminGroupController.kt index cd74027..9718fc6 100644 --- a/web/src/main/kotlin/ru/ysu/lms/web/admin/AdminGroupController.kt +++ b/web/src/main/kotlin/ru/ysu/lms/web/admin/AdminGroupController.kt @@ -256,6 +256,7 @@ class AdminGroupController( fullName = s.fullName, studentNo = s.studentNo, basis = s.basis, + status = s.status, mustChangePassword = s.mustChangePassword, cells = cells, variantsSummary = diff --git a/web/src/main/kotlin/ru/ysu/lms/web/admin/AdminLabView.kt b/web/src/main/kotlin/ru/ysu/lms/web/admin/AdminLabView.kt index a0ceb74..9e3ade9 100644 --- a/web/src/main/kotlin/ru/ysu/lms/web/admin/AdminLabView.kt +++ b/web/src/main/kotlin/ru/ysu/lms/web/admin/AdminLabView.kt @@ -45,6 +45,7 @@ data class GroupStudentRow( val fullName: String, val studentNo: String, val basis: String, + val status: String = "ACTIVE", val mustChangePassword: Boolean, val cells: List, val variantsSummary: String, diff --git a/web/src/main/resources/templates/admin/group.html b/web/src/main/resources/templates/admin/group.html index df7fd36..56d703d 100644 --- a/web/src/main/resources/templates/admin/group.html +++ b/web/src/main/resources/templates/admin/group.html @@ -440,7 +440,7 @@
- + diff --git a/web/src/main/resources/templates/admin/groups.html b/web/src/main/resources/templates/admin/groups.html index f35f513..4b9f084 100644 --- a/web/src/main/resources/templates/admin/groups.html +++ b/web/src/main/resources/templates/admin/groups.html @@ -33,7 +33,7 @@ - +
НазваниеНазвание Год набора Статус Студентов