Use last rated solution info for stats

Author: DedSec256

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

@@ -4,7 +4,7 @@ import {RouteComponentProps} from 'react-router';
 import {AccountDataDto, CourseViewModel, HomeworkViewModel, StatisticsCourseMatesModel} from "../../api";
 import CourseHomework from "../Homeworks/CourseHomework";
 import AddHomework from "../Homeworks/AddHomework";
-import CourseStudents from "./CourseStudents";
+import StudentStats from "./StudentStats";
 import NewCourseStudents from "./NewCourseStudents";
 import ApiSingleton from "../../api/ApiSingleton";
 import {Button, Grid, Tab, Tabs, Typography, IconButton, Switch} from "@material-ui/core";
@@ -294,7 +294,7 @@ const Course: React.FC<RouteComponentProps<ICourseProps>> = (props) => {
                     {tabValue === 1 &&
                         <Grid container style={{marginBottom: "15px"}}>
                             <Grid item xs={11}>
-                                <CourseStudents
+                                <StudentStats
                                     homeworks={courseState.courseHomework}
                                     userId={userId as string}
                                     isMentor={isMentor}

…rc/components/Courses/CourseStudents.tsx …/src/components/Courses/StudentStats.tsxhwproj.front/src/components/Courses/CourseStudents.tsx renamed to hwproj.front/src/components/Courses/StudentStats.tsx hwproj.front/src/components/Courses/CourseStudents.tsx renamed to hwproj.front/src/components/Courses/StudentStats.tsx

@@ -1,23 +1,23 @@
 import React from "react";
 import {CourseViewModel, HomeworkViewModel, StatisticsCourseMatesModel} from "../../api/";
 import {Table, TableBody, TableCell, TableContainer, TableHead, TableRow} from "@material-ui/core";
-import TaskStudentCell from "../Tasks/TaskStudentCell";
+import StudentStatsCell from "../Tasks/StudentStatsCell";
 import {Alert} from "@mui/material";
 
-interface ICourseStudentsProps {
+interface IStudentStatsProps {
     course: CourseViewModel;
     homeworks: HomeworkViewModel[];
     isMentor: boolean;
     userId: string;
     solutions: StatisticsCourseMatesModel[];
 }
 
-interface ICourseStudentsState {
+interface IStudentStatsState {
     searched: string
 }
 
-class CourseStudents extends React.Component<ICourseStudentsProps, ICourseStudentsState> {
-    constructor(props: ICourseStudentsProps) {
+class StudentStats extends React.Component<IStudentStatsProps, IStudentStatsState> {
+    constructor(props: IStudentStatsProps) {
         super(props);
         this.state = {
             searched: ""
@@ -93,7 +93,7 @@ class CourseStudents extends React.Component<ICourseStudentsProps, ICourseStuden
                                     </TableCell>
                                     {homeworks.map((homework) =>
                                         homework.tasks!.map((task) => (
-                                            <TaskStudentCell
+                                            <StudentStatsCell
                                                 solutions={solutions
                                                     .find(s => s.id == cm.id)!.homeworks!
                                                     .find(h => h.id == homework.id)!.tasks!
@@ -115,4 +115,4 @@ class CourseStudents extends React.Component<ICourseStudentsProps, ICourseStuden
     }
 }
 
-export default CourseStudents;
+export default StudentStats;

…src/components/Tasks/TaskStudentCell.tsx …rc/components/Tasks/StudentStatsCell.tsxhwproj.front/src/components/Tasks/TaskStudentCell.tsx renamed to hwproj.front/src/components/Tasks/StudentStatsCell.tsx hwproj.front/src/components/Tasks/TaskStudentCell.tsx renamed to hwproj.front/src/components/Tasks/StudentStatsCell.tsx

@@ -14,20 +14,19 @@ interface ITaskStudentCellProps {
 
 interface ITaskStudentCellState {
     isLoaded: boolean;
-    solution?: StatisticsCourseSolutionsModel;
+    lastRatedSolution?: StatisticsCourseSolutionsModel;
     redirectForMentor: boolean;
     redirectForStudent: boolean;
     color: string;
     ratedSolutionsCount: number;
 }
 
-export default class TaskStudentCell extends React.Component<ITaskStudentCellProps,
-    ITaskStudentCellState> {
+export default class StudentStatsCell extends React.Component<ITaskStudentCellProps, ITaskStudentCellState> {
     constructor(props: ITaskStudentCellProps) {
         super(props);
         this.state = {
             isLoaded: false,
-            solution: {},
+            lastRatedSolution: {},
             redirectForMentor: false,
             redirectForStudent: false,
             color: "",
@@ -59,10 +58,10 @@ export default class TaskStudentCell extends React.Component<ITaskStudentCellPro
                 : this.props.userId === this.props.studentId
                     ? () => this.onStudentCellClick()
                     : () => 0;
-            const result = this.state.solution === undefined || this.state.solution.state! === Solution.StateEnum.NUMBER_0
+            const result = this.state.lastRatedSolution === undefined
                 ? ""
                 : <Stack direction="row" spacing={0.3} justifyContent={"center"} alignItems={"center"}>
-                    <div>{this.state.solution.rating!}</div>
+                    <div>{this.state.lastRatedSolution.rating!}</div>
                     <Chip color={"default"} size={"small"} label={this.state.ratedSolutionsCount}/>
                 </Stack>
             return (
@@ -102,22 +101,25 @@ export default class TaskStudentCell extends React.Component<ITaskStudentCellPro
 
     async componentDidMount() {
         const solutions = this.props.solutions
-        const ratedSolutionsCount = solutions!.filter(x => x.state != Solution.StateEnum.NUMBER_0).length
+        const ratedSolutions = solutions!.filter(x => x.state != Solution.StateEnum.NUMBER_0)
+        const ratedSolutionsCount = ratedSolutions.length
         const isFirstUnratedTry = ratedSolutionsCount === 0
         const lastSolution = solutions!.slice(-1)[0]
+        const lastRatedSolution = ratedSolutions.slice(-1)[0]
+
         if (lastSolution === undefined) {
             this.setState({
                 color: "",
                 isLoaded: true,
-                solution: undefined
+                lastRatedSolution: undefined
             })
             return
         }
         this.setState({
             color: this.getCellBackgroundColor(lastSolution.state, isFirstUnratedTry),
             isLoaded: true,
-            solution: lastSolution,
-            ratedSolutionsCount: ratedSolutionsCount
+            lastRatedSolution: lastRatedSolution,
+            ratedSolutionsCount: ratedSolutions.length
         })
     }
 }