wip

Author: DedSec256

HwProj.CoursesService/HwProj.CoursesService.API/Services/GroupsService.cs

@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using AutoMapper;
 using HwProj.CoursesService.API.Models;
-using HwProj.CoursesService.API.Repositories;
 using HwProj.CoursesService.API.Repositories.Groups;
 using HwProj.Models.CoursesService.DTO;
 using Microsoft.EntityFrameworkCore;
@@ -14,17 +13,14 @@ public class GroupsService : IGroupsService
     {
         private readonly IGroupsRepository _groupsRepository;
         private readonly IGroupMatesRepository _groupMatesRepository;
-        private readonly ICourseFilterRepository _courseFilterRepository;
         private readonly IMapper _mapper;
 
         public GroupsService(IGroupsRepository groupsRepository,
             IGroupMatesRepository groupMatesRepository,
-            ICourseFilterRepository courseFilterRepository,
             IMapper mapper)
         {
             _groupsRepository = groupsRepository;
             _groupMatesRepository = groupMatesRepository;
-            _courseFilterRepository = courseFilterRepository;
             _mapper = mapper;
         }
 
@@ -79,7 +75,6 @@ public async Task UpdateAsync(long groupId, Group updated)
             var studentsToAdd = updatedStudentIds.Except(currentStudentIds).ToList();
             var studentsToRemove = currentStudentIds.Except(updatedStudentIds).ToList();
 
-
             var groupMatesToAdd = updatedGroupMates.Where(x => studentsToAdd.Contains(x.StudentId)).ToArray();
             foreach (var groupMate in groupMatesToAdd) 
                 groupMate.GroupId = groupId;
@@ -93,17 +88,6 @@ await _groupMatesRepository
             {
                 Name = updated.Name
             });
-
-            // Обновляем участников в фильтре группы
-            var groupFilter = await _courseFilterRepository.GetAsync(groupId.ToString(), group.CourseId);
-            if (groupFilter != null)
-            {
-                groupFilter.Filter.StudentIds = updatedStudentIds.ToList();
-                await _courseFilterRepository.UpdateAsync(groupFilter.Id, f => new CourseFilter
-                {
-                    FilterJson = groupFilter.FilterJson
-                });
-            }
         }
 
         public async Task<UserGroupDescription[]> GetStudentGroupsAsync(long courseId, string studentId)

hwproj.front/src/components/Courses/Course.tsx

@@ -10,6 +10,7 @@ import EditIcon from "@material-ui/icons/Edit";
 import {
     Alert,
     AlertTitle,
+    Badge,
     Box,
     Chip,
     Dialog,
@@ -31,6 +32,7 @@ import AssessmentIcon from '@mui/icons-material/Assessment';
 import NameBuilder from "../Utils/NameBuilder";
 import {QRCodeSVG} from 'qrcode.react';
 import QrCode2Icon from '@mui/icons-material/QrCode2';
+import GroupIcon from '@mui/icons-material/Group';
 import {MoreVert} from "@mui/icons-material";
 import {DotLottieReact} from "@lottiefiles/dotlottie-react";
 import {FilesUploadWaiter} from "@/components/Files/FilesUploadWaiter";
@@ -317,20 +319,17 @@ const Course: React.FC = () => {
                         </Grid>
                     </Grid>
                     {isCourseMentor && groups.length > 0 && studentsWithoutGroup.length > 0 &&
-                        <Tooltip
-                            title={
-                                <Box sx={{margin: 0, fontSize: '0.875rem'}}>
-                                    {studentsWithoutGroup.map(s => (
-                                        <div key={s.userId}>{`${s.surname ?? ""} ${s.name ?? ""} / ${s.email ?? ""}`.trim()}</div>
-                                    ))}
-                                </Box>
-                            }
-                            arrow
-                        >
-                            <Alert severity="info" style={{marginBottom: 15, cursor: 'pointer'}}>
-                                Студентов, не записанных в группу: {studentsWithoutGroup.length}
-                            </Alert>
-                        </Tooltip>
+                        <Grid item>
+                            <Tooltip
+                                title={studentsWithoutGroup.length + " студентов не записано в группы"}
+                                arrow
+                                placement="right-end"
+                            >
+                                <Badge badgeContent={studentsWithoutGroup.length} variant="standard" color={"primary"}>
+                                    <GroupIcon color="action" fontSize={"medium"}/>
+                                </Badge>
+                            </Tooltip>
+                        </Grid>
                     }
                     <Tabs
                         style={{marginBottom: 10}}