StudentsRadarChart: улучшения

Author: DedSec256

hwproj.front/src/components/Courses/Statistics/StudentStatsChart.tsx

@@ -6,7 +6,7 @@ import {
     HomeworkViewModel, StatisticsCourseHomeworksModel,
     StatisticsCourseMatesModel,
     StatisticsCourseMeasureSolutionModel
-} from "../../../api/";
+} from "@/api";
 import ApiSingleton from "../../../api/ApiSingleton";
 import HelpPopoverChartInfo from './HelpPopoverChartInfo';
 import StudentCheckboxList from "./StudentCheckboxList";
@@ -15,6 +15,7 @@ import StudentPunctualityChart from './StudentPunctualityChart';
 import NameBuilder from "../../Utils/NameBuilder";
 import {DotLottieReact} from "@lottiefiles/dotlottie-react";
 import { StudentsRadarChart } from "./StudentsRadarChart";
+import {appBarStateManager} from "@/components/AppBar";
 
 interface IStudentStatsChartState {
     isFound: boolean;
@@ -87,6 +88,8 @@ const StudentStatsChart: React.FC = () => {
 
     useEffect(() => {
         setCurrentState()
+        appBarStateManager.setContextAction({actionName: "К курсу", link: `/courses/${courseId}/stats`})
+        return () => appBarStateManager.reset()
     }, [])
 
     useEffect(() => {
@@ -100,19 +103,6 @@ const StudentStatsChart: React.FC = () => {
         return student.name + ' ' + student.surname;
     }
 
-    const renderGoBackToCoursesStatsLink = () => {
-        return (
-            <Link
-                to={`/courses/${state.course.id}/stats`}
-                style={{color: '#212529'}}
-            >
-                <Typography>
-                    Назад к курсу
-                </Typography>
-            </Link>
-        )
-    }
-
     const tasks = state.homeworks.flatMap(h => h.tasks ?? [])
     const tasksAmount = tasks.length
     const tasksWithDeadlineAmount = state.tasksWithDeadline.length
@@ -139,9 +129,6 @@ const StudentStatsChart: React.FC = () => {
                                     <sup style={{color: "#2979ff"}}> бета</sup>
                                 </Typography>
                             </Grid>
-                            <Grid item>
-                                {isLoggedIn && renderGoBackToCoursesStatsLink()}
-                            </Grid>
                         </Grid>
                         {state.isSelectionMode &&
                             <Grid item>
@@ -161,6 +148,8 @@ const StudentStatsChart: React.FC = () => {
                             selectedStudents={selectedStudents}
                             homeworks={state.homeworks}
                             solutions={state.solutions}
+                            averageStudent={state.averageStudent}
+
                         />
                     </Grid>}
                     <Grid xs={12} item>

hwproj.front/src/components/Courses/Statistics/StudentsRadarChart.tsx

@@ -1,22 +1,25 @@
-import {HomeworkViewModel, StatisticsCourseMatesModel} from "@/api";
+import {HomeworkViewModel, StatisticsCourseMatesModel, StatisticsCourseMeasureSolutionModel} from "@/api";
 import {Unstable_RadarChart as RadarChart} from '@mui/x-charts/RadarChart';
 import {FC} from "react";
 import StudentStatsUtils from "@/services/StudentStatsUtils";
 
 export const StudentsRadarChart: FC<{
     selectedStudents: string[],
     homeworks: HomeworkViewModel[],
-    solutions: StatisticsCourseMatesModel[]
+    solutions: StatisticsCourseMatesModel[],
+    averageStudent: StatisticsCourseMeasureSolutionModel[]
 }> = (props) => {
-    const metrics = props.homeworks
+    const homeworks = props.homeworks
+        .filter(h => h.tasks!.length > 0)
+
+    const metrics = homeworks
         .map(x => ({
             name: x.title! + `[id${x.id!}]`,
             id: x.id!,
             max: x.tasks!
                 .map(x => x.maxRating!)
                 .reduce((a, b) => a + b)
         }))
-        .filter(x => x.max > 0)
 
     const series = props.solutions
         .filter(x => props.selectedStudents.includes(x.id!))
@@ -30,8 +33,19 @@ export const StudentsRadarChart: FC<{
                     .reduce((a, b) => a + b))
         }))
 
+    const averageStudent = {
+        label: "Средний студент",
+        fillArea: true,
+        data: homeworks
+            .map(h => h.tasks!
+                .map(t => props.averageStudent.find(y => y.taskId === t.id)?.rating || 0)
+                .reduce((a, b) => a + b))
+    }
+
+    series.push(averageStudent)
+
     return <RadarChart
-        height={400}
+        height={400 + (homeworks.length > 10 ? (homeworks.length - 10) * 10 : 0)}
         series={series}
         radar={{
             metrics,