Task: показывать критерии оценивания на странице решений

Author: DedSec256

hwproj.front/src/components/Tasks/CourseTaskExperimental.tsx

@@ -28,6 +28,7 @@ import CloseIcon from "@mui/icons-material/Close";
 import Collapse from "@mui/material/Collapse";
 import ExpandLessIcon from "@mui/icons-material/ExpandLess";
 import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
+import TaskCriteria from "./TaskCriteria";
 
 
 interface IEditTaskMetadataState {
@@ -547,24 +548,7 @@ const CourseTaskExperimental: FC<{
                 <MarkdownPreview value={task.description!}/>
             </Typography>
 
-            {task.criteria && task.criteria.length > 0 && (
-                <>
-                    <Divider style={{marginTop: 15, marginBottom: 10}}/>
-
-                    <Typography variant="h6" gutterBottom style={{fontSize: 16}}>
-                        Критерии оценивания
-                    </Typography>
-
-                    <Stack spacing={0.5}>
-                        {task.criteria.map(c => (
-                            <Stack key={c.id} direction="row" alignItems={"center"} justifyContent="space-between">
-                                <Typography variant="body2">{c.name}</Typography>
-                                <Chip style={{fontSize: 14}} size={"small"} color={"default"} label={c.maxPoints}/>
-                            </Stack>
-                        ))}
-                    </Stack>
-                </>
-            )}
+            <TaskCriteria task={task}/>
         </CardContent>
     );
 }

hwproj.front/src/components/Tasks/Task.tsx

@@ -1,21 +1,16 @@
 import * as React from 'react';
 import Typography from '@material-ui/core/Typography';
-import IconButton from '@material-ui/core/IconButton'
-import DeleteIcon from '@material-ui/icons/Delete'
 import ExpandMoreIcon from '@material-ui/icons/ExpandMore';
-import EditIcon from '@material-ui/icons/Edit'
-import {HomeworkTaskViewModel} from "../../api";
-import {Link as RouterLink} from 'react-router-dom'
-import ApiSingleton from "../../api/ApiSingleton";
-import {Accordion, AccordionDetails, AccordionSummary, Button, Grid, Tooltip} from '@material-ui/core';
-import {FC, useState} from "react";
+import {HomeworkTaskViewModel} from "@/api";
+import {Accordion, AccordionDetails, AccordionSummary, Grid, Tooltip} from '@material-ui/core';
+import {FC} from "react";
 import {makeStyles} from '@material-ui/core/styles';
-import DeletionConfirmation from "../DeletionConfirmation";
 import {Chip, Stack} from "@mui/material";
 import Utils from "../../services/Utils";
 import {getTip} from "../Common/HomeworkTags";
 import StarIcon from '@mui/icons-material/Star';
 import {MarkdownPreview} from "../Common/MarkdownEditor";
+import TaskCriteria from "@/components/Tasks/TaskCriteria";
 
 interface ITaskProp {
     task: HomeworkTaskViewModel,
@@ -46,21 +41,6 @@ const Task: FC<ITaskProp> = (props) => {
     const publicationDateIsSet = !props.task.publicationDateNotSet
     const deadlineDateIsSet = !props.task.deadlineDateNotSet
 
-    const [isOpenDialogDeleteTask, setIsOpenDialogDeleteTask] = useState<boolean>(false)
-
-    const openDialogDeleteTask = () => {
-        setIsOpenDialogDeleteTask(true)
-    }
-
-    const closeDialogDeleteTask = () => {
-        setIsOpenDialogDeleteTask(false)
-    }
-
-    const deleteTask = async () => {
-        await ApiSingleton.tasksApi.tasksDeleteTask(props.task.id!)
-        props.onDeleteClick()
-    }
-
     const {task} = props
 
     const publicationDateString = Utils.renderReadableDate(publicationDate)
@@ -116,7 +96,7 @@ const Task: FC<ITaskProp> = (props) => {
                             }
                             {task.hasDeadline && deadlineDateIsSet &&
                                 <Grid item>
-                                    <Tooltip 
+                                    <Tooltip
                                         arrow
                                         title={task.isDeadlineStrict ? "Нельзя публиковать решения после дедлайна" : "Дедлайн"}
                                     >
@@ -139,16 +119,6 @@ const Task: FC<ITaskProp> = (props) => {
                                     <Chip variant="outlined" label="без дедлайна"/>
                                 </Grid>
                             }
-                            {props.forMentor && !props.isReadingMode &&
-                                <Grid item>
-                                    <IconButton aria-label="Delete" onClick={openDialogDeleteTask}>
-                                        <DeleteIcon fontSize="small"/>
-                                    </IconButton>
-                                    <RouterLink to={'/task/' + task.id!.toString() + '/edit'}>
-                                        <EditIcon fontSize="small"/>
-                                    </RouterLink>
-                                </Grid>
-                            }
                         </Grid>
                     </div>
                 </AccordionSummary>
@@ -157,31 +127,10 @@ const Task: FC<ITaskProp> = (props) => {
                         <Typography variant="body1">
                             <MarkdownPreview value={task.description!}/>
                         </Typography>
-                        {props.showForCourse && props.forStudent &&
-                            <div style={{marginTop: '15px'}}>
-                                <Button
-                                    style={{width: '150px'}}
-                                    size="small"
-                                    variant="contained"
-                                    color="primary"
-                                    onClick={() => window.location.assign("/task/" + task.id!.toString())}
-                                >
-                                    Решения
-                                </Button>
-                            </div>
-                        }
+                        <TaskCriteria task={task}/>
                     </Grid>
                 </AccordionDetails>
             </Accordion>
-            <DeletionConfirmation
-                onCancel={closeDialogDeleteTask}
-                onSubmit={deleteTask}
-                isOpen={isOpenDialogDeleteTask}
-                dialogTitle={'Удаление задачи'}
-                dialogContentText={`Вы точно хотите удалить задачу "${task.title}"?`}
-                confirmationWord={''}
-                confirmationText={''}
-            />
         </div>
     );
 }

hwproj.front/src/components/Tasks/TaskCriteria.tsx

@@ -0,0 +1,25 @@
+import {HomeworkTaskViewModel} from "@/api";
+import {Chip, Divider, Stack, Typography} from "@mui/material";
+import {FC} from "react";
+
+const TaskCriteria: FC<{ task: HomeworkTaskViewModel }> = ({task}) => {
+    return task.criteria && task.criteria.length > 0 ? (
+        <>
+            <Divider style={{marginTop: 15, marginBottom: 10}}/>
+
+            <Typography variant="h6" gutterBottom style={{fontSize: 16}}>
+                Критерии оценивания
+            </Typography>
+
+            <Stack spacing={0.5}>
+                {task.criteria.map(c => (
+                    <Stack key={c.id} direction="row" alignItems={"center"} justifyContent="space-between">
+                        <Typography variant="body2">{c.name}</Typography>
+                        <Chip style={{fontSize: 14}} size={"small"} color={"default"} label={c.maxPoints}/>
+                    </Stack>
+                ))}
+            </Stack>
+        </>
+    ) : null
+}
+export default TaskCriteria;