{isAda && checked &&
}
{
- const assignmentProgressContext = useContext(AssignmentProgressPageSettingsContext);
-
- return
-
- Table display mode
-
- assignmentProgressContext?.setFormatAsPercentage?.(e.currentTarget.checked)}
- />
-
-
- {isPhy &&
- Colour-blind mode
-
- assignmentProgressContext?.setColourBlind?.(e.currentTarget.checked)}
- />
-
}
-
- {isPhy &&
- Completion display mode
-
- assignmentProgressContext?.setAttemptedOrCorrect?.(e.currentTarget.checked ? "CORRECT" : "ATTEMPTED")}
- />
-
}
-
;
-};
-
-export function markClassesInternal(attemptedOrCorrect: "ATTEMPTED" | "CORRECT", studentProgress: AssignmentProgressDTO, status: CompletionState | null, correctParts: number, incorrectParts: number, totalParts: number) {
- if (attemptedOrCorrect === "CORRECT") {
- if (!isAuthorisedFullAccess(studentProgress)) {
- return "revoked";
- } else if (status === CompletionState.ALL_CORRECT || correctParts === totalParts) {
- return "completed";
- } else if (status === CompletionState.NOT_ATTEMPTED || correctParts + incorrectParts === 0) {
- return "not-attempted";
- } else if ((correctParts / totalParts) >= passMark) {
- return "passed";
- } else if ((correctParts / totalParts) < (1 - passMark)) {
- return "failed";
- } else {
- return "in-progress";
- }
- } else {
- if (!isAuthorisedFullAccess(studentProgress)) {
- return "revoked";
- } else if (status && isQuestionFullyAttempted(status) || correctParts + incorrectParts === totalParts) {
- return "fully-attempted";
- } else if (status === CompletionState.NOT_ATTEMPTED || siteSpecific((correctParts + incorrectParts) / totalParts < (1 - passMark), correctParts + incorrectParts === 0)) {
- return "not-attempted";
- } else if ((correctParts + incorrectParts) / totalParts >= passMark) {
- return "passed";
- } else {
- return "in-progress";
- }
- }
-}
-
-const BoardLink = ({id}: {id?: string}) =>
e.stopPropagation()}>
-
-;
-
-interface GroupAssignmentTabProps {
- assignment: EnhancedAssignmentWithProgress;
- progress: AssignmentProgressDTO[];
-}
-
-const GroupAssignmentTab = ({assignment, progress}: GroupAssignmentTabProps) => {
- const assignmentProgressContext = useContext(AssignmentProgressPageSettingsContext);
- const questions = assignment.gameboard.contents;
-
- const assignmentTotalQuestionParts = questions.reduce((acc, q) => {
- return acc + (q?.questionPartsTotal ?? 0);
- }, 0);
-
- function markClasses(studentProgress: AssignmentProgressDTO, totalParts: number) {
- if (!isAuthorisedFullAccess(studentProgress)) {
- return "revoked";
- }
-
- const correctParts = studentProgress.correctQuestionPartsCount;
- const incorrectParts = studentProgress.incorrectQuestionPartsCount;
- const status = null;
-
- return markClassesInternal(assignmentProgressContext?.attemptedOrCorrect ?? "CORRECT", studentProgress, status, correctParts, incorrectParts, totalParts);
- }
-
- function markQuestionClasses(studentProgress: AssignmentProgressDTO, index: number) {
- if (!isAuthorisedFullAccess(studentProgress)) {
- return "revoked";
- }
-
-
- const question = questions[index];
-
- const totalParts = question.questionPartsTotal;
- const correctParts = (studentProgress.correctPartResults || [])[index];
- const incorrectParts = (studentProgress.incorrectPartResults || [])[index];
- const status = (studentProgress.questionResults || [])[index];
-
- return markClassesInternal(assignmentProgressContext?.attemptedOrCorrect ?? "CORRECT", studentProgress, status, correctParts, incorrectParts, totalParts);
- }
-
- const [settingsVisible, setSettingsVisible] = useState(true);
-
- return
-
-
-
-
- {siteSpecific(
-
Overview: {assignment.gameboard.title}
,
- Group assignment overview
- )}
- See who attempted the assignment and which questions they struggled with.
-
- {isPhy &&
}
-
-
;
-};
-
-export const ResultsTableHeader = ({settingsVisible, isAssignment} : {settingsVisible: boolean, isAssignment: boolean}) => {
- const assignmentProgressContext = useContext(AssignmentProgressPageSettingsContext);
-
- return <>
-
- {isPhy &&
-
- }
-
- {isAda && <>
-
assignmentProgressContext?.setFormatAsPercentage?.(e.currentTarget.checked)}
- label={Show mark as percentages}
- />
-
-
- }
-
- ;
-};
-
-export const AdaAssignmentProgressKey = ({isAssignment}: {isAssignment: boolean}) => {
- const context = useContext(AssignmentProgressPageSettingsContext);
-
- const KeyItem = ({icon, label}: {icon: React.ReactNode, label: string}) => (
-
- {icon} {label}
-
- );
-
- return
-
Key
- {context?.attemptedOrCorrect === "CORRECT"
- ? <>
-
-
- {isAssignment && }
-
-
-
-
-
-
- : <>
-
-
- {isAssignment && }
-
-
-
- }
-
;
-};
-
-const QuestionLink = ({questionId, boardId}: {questionId?: string, boardId?: string}) =>
e.stopPropagation()} aria-label="Open question in new tab">
-
-;
-
-interface DetailedMarksProps extends React.HTMLAttributes
{
- progress: AssignmentProgressDTO[];
- questions: GameboardItem[];
- questionIndex: number;
- gameboardId?: string;
-}
-
-const DetailedMarksCard = ({progress, questions, questionIndex, gameboardId, ...rest}: DetailedMarksProps) => {
- const [isOpen, setIsOpen] = useState(false);
-
- const difficultParts = useMemo(() => {
- const totalIncorrectByPart = progress.map(p => p.questionPartResults?.[questionIndex].map(state => state === "INCORRECT" ? 1 : 0) || []).reduce((acc, curr) => {
- curr.forEach((val, i) => {
- acc[i] = (acc[i] || 0) + val;
- });
- return acc;
- }, [] as number[]);
-
- const total = progress.length;
- return totalIncorrectByPart.reduce((acc, incorrect, index) => {
- if (total >= 2 && incorrect / total >= 0.5) {
- return [...acc, index];
- }
- return acc;
- }, [] as number[]);
- }, [progress, questionIndex]);
-
- const numAttemptedThisQuestion = useMemo(() => {
- return progress.filter(p => isQuestionFullyAttempted(p.questionResults?.[questionIndex])).length;
- }, [progress, questionIndex]);
-
- return
-
-
-
- {/* nested divs required for clean table border when scrolling :/ */}
-
-
-
-
-
Performance on questions
,
- Performance on questions
- )}
- See the questions your students answered{isPhy && " and which parts they struggled with"}.
-
- {isPhy && }
-
- {questions.map((_, questionIndex) => (
-
- ))}
-
-
- ;
-};
-
-function isQuestionFullyAttempted (state?: CompletionState) {
- return !!state && [CompletionState.ALL_CORRECT, CompletionState.ALL_ATTEMPTED, CompletionState.ALL_INCORRECT].includes(state);
-}
-
-export const ProgressDetails = ({assignment}: { assignment: EnhancedAssignmentWithProgress }) => {
-
- const dispatch = useAppDispatch();
- const questions = assignment.gameboard.contents;
-
- const progressData = useMemo<[AssignmentProgressDTO, boolean][]>(() => assignment.progress.map(p => {
- if (!isAuthorisedFullAccess(p)) return [p, false];
-
- const initialState = {
- ...p,
- correctQuestionPagesCount: 0,
- correctQuestionPartsCount: 0,
- incorrectQuestionPartsCount: 0,
- notAttemptedPartResults: []
- };
-
- const ret = (p.questionResults || []).reduce((oldP, results, i) => {
- const correctQuestionsCount = [CompletionState.ALL_CORRECT].includes(results) ? oldP.correctQuestionPagesCount + 1 : oldP.correctQuestionPagesCount;
- const questions = assignment.gameboard.contents;
- return {
- ...oldP,
- correctQuestionPagesCount: correctQuestionsCount,
- correctQuestionPartsCount: oldP.correctQuestionPartsCount + (p.correctPartResults || [])[i],
- incorrectQuestionPartsCount: oldP.incorrectQuestionPartsCount + (p.incorrectPartResults || [])[i],
- notAttemptedPartResults: [
- ...oldP.notAttemptedPartResults,
- (questions[i].questionPartsTotal - (p.correctPartResults || [])[i] - (p.incorrectPartResults || [])[i])
- ]
- };
- }, initialState);
- return [ret, questions.length === ret.correctQuestionPagesCount];
- }), [assignment.gameboard.contents, assignment.progress, questions.length]);
-
- const progress = progressData.map(pd => pd[0]);
-
- const numStudentsAttemptedAll = progress.filter(p => p.questionResults?.every(isQuestionFullyAttempted)).length;
- const numStudentsCompletedAll = progress.filter(p => p.questionResults?.every(r => r === CompletionState.ALL_CORRECT)).length;
-
- return <>
-
- {isPhy &&
-
- Back to group assignments and tests
- }
- {isPhy && }
-
-
-
-
-
-
-
- Due: {formatDate(assignment.dueDate)}
-
-
-
- {numStudentsAttemptedAll} of {progress.length} attempted all questions
-
-
-
- {numStudentsCompletedAll} of {progress.length} got full marks
-
-
-
-
-
- {{
- "Group overview": ,
- "Detailed marks":
- }}
-
- ;
-
-};
diff --git a/src/app/components/pages/SingleAssignmentProgress.tsx b/src/app/components/pages/SingleAssignmentProgress.tsx
deleted file mode 100644
index a2cf8923d0..0000000000
--- a/src/app/components/pages/SingleAssignmentProgress.tsx
+++ /dev/null
@@ -1,102 +0,0 @@
-import React, {useContext} from "react";
-import {useParams} from "react-router-dom";
-import {TitleAndBreadcrumb} from "../elements/TitleAndBreadcrumb";
-import {Label} from "reactstrap";
-import {
- useGetAssignmentProgressQuery,
- useGetSingleSetAssignmentQuery
-} from "../../state";
-import {
- AppGroup,
- AssignmentProgressPageSettingsContext,
- EnhancedAssignmentWithProgress
-} from "../../../IsaacAppTypes";
-import {
- ASSIGNMENT_PROGRESS_CRUMB,
- PATHS,
- siteSpecific,
- useAssignmentProgressAccessibilitySettings} from "../../services";
-import {ProgressDetails} from "./AssignmentProgressIndividual";
-import {skipToken} from "@reduxjs/toolkit/query";
-import {combineQueries, ShowLoadingQuery} from "../handlers/ShowLoadingQuery";
-import {AssignmentDTO, AssignmentProgressDTO, RegisteredUserDTO} from "../../../IsaacApiTypes";
-import { passMark } from "../elements/quiz/QuizProgressCommon";
-import { PageContainer } from "../elements/layout/PageContainer";
-import { MyAdaSidebar } from "../elements/sidebar/MyAdaSidebar";
-
-const SingleProgressDetails = ({assignment}: {assignment: EnhancedAssignmentWithProgress}) => {
- const pageSettings = useContext(AssignmentProgressPageSettingsContext);
-
- return ;
-};
-
-export const SingleAssignmentProgress = ({user, group}: {user: RegisteredUserDTO, group?: AppGroup}) => {
- const params = useParams<{ assignmentId?: string }>();
- const assignmentId = parseInt(params.assignmentId || ""); // DANGER: This will produce a NaN if params.assignmentId is undefined
- const assignmentQuery = useGetSingleSetAssignmentQuery(assignmentId || skipToken);
- const { data: assignment } = assignmentQuery;
- const assignmentProgressQuery = useGetAssignmentProgressQuery(assignmentId || skipToken);
-
- const groupCrumb = group && group.groupName ? {to: `${PATHS.ASSIGNMENT_PROGRESS}/group/${group.id}`, title: group.groupName} : undefined;
-
- const augmentAssignmentWithProgress = (assignment: AssignmentDTO, assignmentProgress: AssignmentProgressDTO[]): EnhancedAssignmentWithProgress => ({...assignment, progress: assignmentProgress} as EnhancedAssignmentWithProgress);
-
- const pageSettings = useAssignmentProgressAccessibilitySettings({user});
-
- return
- }
- sidebar={siteSpecific(null, )}
- >
-
-
- }
- />
- ;
-};
-
-const LegendKey = ({cellClass, description}: {cellClass: string, description?: string}) => {
- return
-
- {description && {description}
}
- ;
-};
-
-export const AssignmentProgressLegend = ({id}: {id?: string}) => {
- const context = useContext(AssignmentProgressPageSettingsContext);
- return
-
-
- {context?.attemptedOrCorrect === "CORRECT"
- ?
- :
- }
-
-
+
+ Due: {formatDate(dueDate)}
+
+
+
+ {studentsAttempted} of {totalStudents} {isQuiz ? "submitted their test" : "attempted all questions"}
+
+
+
+ {studentsCompleted} of {totalStudents} got full marks
+
+
+ ;
+};
+
+const ProgressDetails = ({assignment}: { assignment: EnhancedAssignmentWithProgress }) => {
+ const dispatch = useAppDispatch();
+ const questions = assignment.gameboard.contents;
+ const pageSettings = useContext(AssignmentProgressPageSettingsContext);
+
+ const progressData = useMemo<[AssignmentProgressDTO, boolean][]>(() => assignment.progress.map(p => {
+ if (!isAuthorisedFullAccess(p)) return [p, false];
+
+ const initialState = {
+ ...p,
+ correctQuestionPagesCount: 0,
+ correctQuestionPartsCount: 0,
+ incorrectQuestionPartsCount: 0,
+ notAttemptedPartResults: []
+ };
+
+ const ret = (p.questionResults || []).reduce((oldP, results, i) => {
+ const correctQuestionsCount = [CompletionState.ALL_CORRECT].includes(results) ? oldP.correctQuestionPagesCount + 1 : oldP.correctQuestionPagesCount;
+ const questions = assignment.gameboard.contents;
+ return {
+ ...oldP,
+ correctQuestionPagesCount: correctQuestionsCount,
+ correctQuestionPartsCount: oldP.correctQuestionPartsCount + (p.correctPartResults || [])[i],
+ incorrectQuestionPartsCount: oldP.incorrectQuestionPartsCount + (p.incorrectPartResults || [])[i],
+ notAttemptedPartResults: [
+ ...oldP.notAttemptedPartResults,
+ (questions[i].questionPartsTotal - (p.correctPartResults || [])[i] - (p.incorrectPartResults || [])[i])
+ ]
+ };
+ }, initialState);
+ return [ret, questions.length === ret.correctQuestionPagesCount];
+ }), [assignment.gameboard.contents, assignment.progress, questions.length]);
+
+ const progress = progressData.map(pd => pd[0]);
+
+ const numStudentsAttemptedAll = progress.filter(p => p.questionResults?.every(isQuestionFullyAttempted)).length;
+ const numStudentsCompletedAll = progress.filter(p => p.questionResults?.every(r => r === CompletionState.ALL_CORRECT)).length;
+ const [settingsVisible, setSettingsVisible] = useState(true);
+
+ return
+
+ {isPhy &&
+
+ Back to group assignments and tests
+ }
+ {isPhy && }
+
+
+
+
+
+
+ {{
+ "Group overview": ,
+ "Detailed marks":
+ }}
+
+
Overview: {assignment.gameboard.title}
,
+ Group assignment overview
+ )}
+ See who attempted the assignment and which questions they struggled with.
+