From 796d92443510b2071e20a327aa5848bc1f9974ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A0=D0=BE=D1=81=D0=B8=D0=BD=20=D0=A1=D0=B5=D0=BC=D1=91?=
 =?UTF-8?q?=D0=BD?= <semen.rosin1@gmail.com>
Date: Sat, 25 Apr 2026 14:17:36 +0300
Subject: [PATCH 1/2] fix: student to group counting

---
 hwproj.front/src/components/Common/GroupSelector.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hwproj.front/src/components/Common/GroupSelector.tsx b/hwproj.front/src/components/Common/GroupSelector.tsx
index 05b9c9fba..5e94899ff 100644
--- a/hwproj.front/src/components/Common/GroupSelector.tsx
+++ b/hwproj.front/src/components/Common/GroupSelector.tsx
@@ -51,7 +51,7 @@ const GroupSelector: FC<GroupSelectorProps> = (props) => {
 
     const studentToGroups = useMemo(() => {
         const map = new Map<string, string[]>();
-        (props.groups || []).concat(formState).forEach(g => {
+        (groups.filter(g => g.name) || []).concat(formState).forEach(g => {
             g.studentsIds?.forEach(stId => {
                 if (!map.has(stId)) map.set(stId, []);
                 map.get(stId)!.push(g.name!);

From 76070d6c87fa6cce571713f83610d6b137548ac0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A0=D0=BE=D1=81=D0=B8=D0=BD=20=D0=A1=D0=B5=D0=BC=D1=91?=
 =?UTF-8?q?=D0=BD?= <semen.rosin1@gmail.com>
Date: Sat, 25 Apr 2026 14:51:50 +0300
Subject: [PATCH 2/2] fix

---
 hwproj.front/src/components/Common/GroupSelector.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hwproj.front/src/components/Common/GroupSelector.tsx b/hwproj.front/src/components/Common/GroupSelector.tsx
index 5e94899ff..b83e7d6a7 100644
--- a/hwproj.front/src/components/Common/GroupSelector.tsx
+++ b/hwproj.front/src/components/Common/GroupSelector.tsx
@@ -51,7 +51,7 @@ const GroupSelector: FC<GroupSelectorProps> = (props) => {
 
     const studentToGroups = useMemo(() => {
         const map = new Map<string, string[]>();
-        (groups.filter(g => g.name) || []).concat(formState).forEach(g => {
+        (props.groups || []).concat(formState).forEach(g => {
             g.studentsIds?.forEach(stId => {
                 if (!map.has(stId)) map.set(stId, []);
                 map.get(stId)!.push(g.name!);
@@ -145,7 +145,7 @@ const GroupSelector: FC<GroupSelectorProps> = (props) => {
                         getOptionLabel={(option) => {
                             const groups = studentToGroups.get(option.userId!);
                             const groupSuffix = groups && groups.length > 0
-                                ? ' — в группе: ' + groups[0]
+                                ? ' — в команде'
                                 : '';
                             return `${option.surname ?? ""} ${option.name ?? ""}  ${option.middleName ?? ""}${groupSuffix}`.trim();
                         }}