diff --git a/src/components/SemesterAdministration/SemesterAdministration.tsx b/src/components/SemesterAdministration/SemesterAdministration.tsx index 43cf2b05..6018e455 100644 --- a/src/components/SemesterAdministration/SemesterAdministration.tsx +++ b/src/components/SemesterAdministration/SemesterAdministration.tsx @@ -1,7 +1,8 @@ import {Stack, Typography} from '@mui/material' +import Grid from '@mui/material/Unstable_Grid2' import {useMutation, useQuery} from '@tanstack/react-query' import axios, {AxiosError} from 'axios' -import {FC, useState} from 'react' +import {FC, Fragment, useState} from 'react' import {Button} from '@/components/Clickable/Button' import {Link} from '@/components/Clickable/Link' @@ -149,13 +150,35 @@ export const SemesterAdministration: FC = () => { Termín série: {formatDateTime(series.deadline)} - + {series?.problems.map((problem) => ( - - {problem.order}. úloha - + + + + {problem.order}. úloha + + + + {problem.num_corrected_solutions === problem.num_solutions ? ( + <>{`Opravené (${problem.num_solutions})`} + ) : ( + <> + {problem.num_corrected_solutions}/{problem.num_solutions} + + )} + + + {problem.solution_pdf ? ( + + Vzorák + + ) : ( + <>{'chýba vzorák'} + )} + + ))} - + ))} diff --git a/src/types/api/generated/competition.ts b/src/types/api/generated/competition.ts index 78610e60..b354aecc 100644 --- a/src/types/api/generated/competition.ts +++ b/src/types/api/generated/competition.ts @@ -66,10 +66,13 @@ export interface ProblemCorrection { export interface Problem { id: number submitted?: any + num_solutions: number + num_corrected_solutions: number text: string order: number image?: any | null series?: any + solution_pdf?: string } export interface Comment {