StudentStats: отображение бонусных заданий

Author: DedSec256

hwproj.front/src/components/Common/HomeworkTags.tsx

@@ -10,7 +10,7 @@ export const isTestWork = (tagsOwner: { tags?: string[] }) => tagsOwner.tags?.in
 export const isBonusWork = (tagsOwner: { tags?: string[] }) => tagsOwner.tags?.includes(BonusTag) ?? false
 
 export const TestTip: FC = () => <sup style={{color: "#2979ff"}}> тест</sup>
-const BonusTip: FC = () => <sup style={{color: "green"}}> бонус</sup>
+export const BonusTip: FC = () => <sup style={{color: "green"}}> бонус</sup>
 const TestBonusTip: FC = () => <sup style={{color: "#2979ff"}}> бонус</sup>
 
 export const getTip = (tagsOwner: { tags?: string[] }) => {

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

@@ -7,7 +7,7 @@ import {Alert, Button, Chip, IconButton, Stack, Typography} from "@mui/material"
 import {grey} from "@material-ui/core/colors";
 import StudentStatsUtils from "../../services/StudentStatsUtils";
 import ShowChartIcon from "@mui/icons-material/ShowChart";
-import {BonusTag, DefaultTags, TestTag} from "../Common/HomeworkTags";
+import {BonusTag, BonusTip, DefaultTags, TestTag} from "../Common/HomeworkTags";
 import Lodash from "lodash"
 import ApiSingleton from "@/api/ApiSingleton";
 import FullscreenIcon from '@mui/icons-material/Fullscreen';
@@ -113,7 +113,7 @@ const StudentStats: React.FC<IStudentStatsProps> = (props) => {
         })
         .values()
         .value();
-    
+
     const testHomeworks = testGroups.map(x => x[0])
 
     const homeworksWithGroups = notTests.filter(h => h.groupId)
@@ -153,6 +153,12 @@ const StudentStats: React.FC<IStudentStatsProps> = (props) => {
             .forEach(x => bestTaskSolutions.set(x.taskId!, x.studentId!))
     }
 
+    const renderTitle = (x: { title?: string, tags?: string[] }) => {
+        return <>
+            {x.title}{x.tags?.includes(BonusTag) && <BonusTip/>}
+        </>
+    }
+
     return (
         <div>
             {props.solutions === undefined && <LinearProgress/>}
@@ -201,7 +207,7 @@ const StudentStats: React.FC<IStudentStatsProps> = (props) => {
                                     }}
                                     colSpan={homework.tasks!.length}
                                 >
-                                    {homework.title}
+                                    {renderTitle(homework)}
                                 </TableCell>)}
                         </TableRow>
                         <TableRow>
@@ -248,7 +254,7 @@ const StudentStats: React.FC<IStudentStatsProps> = (props) => {
                                                    ...homeworkStyles(homeworks, idx)
                                                }}
                                                key={task.id}>
-                                        {task.title}
+                                        {renderTitle(task)}
                                     </TableCell>
                                 ))
                             )}