wip

Author: DedSec256

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

@@ -36,6 +36,7 @@ import ArrowUpwardIcon from '@mui/icons-material/ArrowUpward';
 import SwitchAccessShortcutIcon from '@mui/icons-material/SwitchAccessShortcut';
 import Lodash from "lodash";
 import {CourseUnitType} from "@/components/Files/CourseUnitType";
+import GroupIcon from '@mui/icons-material/Group';
 
 interface ICourseExperimentalProps {
     homeworks: HomeworkViewModel[]
@@ -573,13 +574,17 @@ export const CourseExperimental: FC<ICourseExperimentalProps> = (props) => {
                                             }
                                         }))
                                     }}>
-                                    <Typography variant="h6" style={{fontSize: 18}} align={"center"}
-                                                color={x.isDeferred
-                                                    ? "textSecondary"
-                                                    : x.tags!.includes(TestTag) ? "primary" : "textPrimary"}>
-                                        {isMentor && renderHomeworkStatus(x)}
-                                        {x.title}{getTip(x)}
-                                    </Typography>
+                                    <Stack direction={"column"} alignItems={"center"}>
+                                        {x.groupId && <GroupIcon fontSize={"small"}
+                                                                 color={x.isDeferred ? "disabled" : x.tags!.includes(TestTag) ? "primary" : "action"}/>}
+                                        <Typography variant="h6" style={{fontSize: 18}} align={"center"}
+                                                    color={x.isDeferred
+                                                        ? "textSecondary"
+                                                        : x.tags!.includes(TestTag) ? "primary" : "textPrimary"}>
+                                            {isMentor && renderHomeworkStatus(x)}
+                                            {x.title}{getTip(x)}
+                                        </Typography>
+                                    </Stack>
                                     {x.isDeferred && !x.publicationDateNotSet &&
                                         <Typography style={{fontSize: "14px"}} align={"center"}>
                                             {"🕘 " + renderDate(x.publicationDate!) + " " + renderTime(x.publicationDate!)}

hwproj.front/src/components/Homeworks/CourseHomeworkExperimental.tsx

@@ -455,6 +455,7 @@ const CourseHomeworkExperimental: FC<{
     const tasksCount = homework.tasks!.length
     const [showEditMode, setShowEditMode] = useState(false)
     const [editMode, setEditMode] = useState(false)
+    const group = props.groups.find(g => g.id === homework.groupId)
 
     useEffect(() => {
         setEditMode(props.initialEditMode)
@@ -514,6 +515,13 @@ const CourseHomeworkExperimental: FC<{
                 </Stack>
             </Grid>}
         </Grid>
+        {group &&
+            <Typography variant="body1" style={{color: "#454545"}} gutterBottom>
+                <Stack direction={"row"} alignItems={"center"} spacing={1}>
+                    <GroupIcon fontSize={"small"}/>
+                    <div>{group.name}</div>
+                </Stack>
+            </Typography>}
         <Divider style={{marginTop: 15, marginBottom: 15}}/>
         <Typography component="div" style={{color: "#454545"}} gutterBottom variant="body1">
             <MarkdownPreview value={homework.description!}/>