Improved the way a teacher views the assignments

src/dashboards/AssignmentView.tsx

@@ -0,0 +1,270 @@
+import ProgressBar from "@/components/Low/ProgressBar";
+import Modal from "@/components/Modal";
+import useUsers from "@/hooks/useUsers";
+import {Module} from "@/interfaces";
+import {Assignment} from "@/interfaces/results";
+import {Stat, User} from "@/interfaces/user";
+import useExamStore from "@/stores/examStore";
+import {getExamById} from "@/utils/exams";
+import {sortByModule} from "@/utils/moduleUtils";
+import {calculateBandScore} from "@/utils/score";
+import {convertToUserSolutions} from "@/utils/stats";
+import clsx from "clsx";
+import {uniqBy} from "lodash";
+import moment from "moment";
+import {useRouter} from "next/router";
+import {BsBook, BsHeadphones, BsMegaphone, BsPen} from "react-icons/bs";
+
+interface Props {
+	isOpen: boolean;
+	assignment?: Assignment;
+	onClose: () => void;
+}
+
+export default function AssignmentView({isOpen, assignment, onClose}: Props) {
+	const {users} = useUsers();
+	const router = useRouter();
+
+	const setExams = useExamStore((state) => state.setExams);
+	const setShowSolutions = useExamStore((state) => state.setShowSolutions);
+	const setUserSolutions = useExamStore((state) => state.setUserSolutions);
+	const setSelectedModules = useExamStore((state) => state.setSelectedModules);
+
+	const formatTimestamp = (timestamp: string) => {
+		const date = moment(parseInt(timestamp));
+		const formatter = "YYYY/MM/DD - HH:mm";
+
+		return date.format(formatter);
+	};
+
+	const calculateAverageModuleScore = (module: Module) => {
+		if (!assignment) return -1;
+
+		const resultModuleBandScores = assignment.results.map((r) => {
+			const moduleStats = r.stats.filter((s) => s.module === module);
+
+			const correct = moduleStats.reduce((acc, curr) => acc + curr.score.correct, 0);
+			const total = moduleStats.reduce((acc, curr) => acc + curr.score.total, 0);
+			return calculateBandScore(correct, total, module, r.type);
+		});
+
+		return resultModuleBandScores.length === 0 ? -1 : resultModuleBandScores.reduce((acc, curr) => acc + curr, 0) / assignment.results.length;
+	};
+
+	const aggregateScoresByModule = (stats: Stat[]): {module: Module; total: number; missing: number; correct: number}[] => {
+		const scores: {[key in Module]: {total: number; missing: number; correct: number}} = {
+			reading: {
+				total: 0,
+				correct: 0,
+				missing: 0,
+			},
+			listening: {
+				total: 0,
+				correct: 0,
+				missing: 0,
+			},
+			writing: {
+				total: 0,
+				correct: 0,
+				missing: 0,
+			},
+			speaking: {
+				total: 0,
+				correct: 0,
+				missing: 0,
+			},
+		};
+
+		stats.forEach((x) => {
+			scores[x.module!] = {
+				total: scores[x.module!].total + x.score.total,
+				correct: scores[x.module!].correct + x.score.correct,
+				missing: scores[x.module!].missing + x.score.missing,
+			};
+		});
+
+		return Object.keys(scores)
+			.filter((x) => scores[x as Module].total > 0)
+			.map((x) => ({module: x as Module, ...scores[x as Module]}));
+	};
+
+	const customContent = (stats: Stat[], user: string, focus: "academic" | "general") => {
+		const correct = stats.reduce((accumulator, current) => accumulator + current.score.correct, 0);
+		const total = stats.reduce((accumulator, current) => accumulator + current.score.total, 0);
+		const aggregatedScores = aggregateScoresByModule(stats).filter((x) => x.total > 0);
+
+		const aggregatedLevels = aggregatedScores.map((x) => ({
+			module: x.module,
+			level: calculateBandScore(x.correct, x.total, x.module, focus),
+		}));
+
+		const timeSpent = stats[0].timeSpent;
+
+		const selectExam = () => {
+			const examPromises = uniqBy(stats, "exam").map((stat) => getExamById(stat.module, stat.exam));
+
+			Promise.all(examPromises).then((exams) => {
+				if (exams.every((x) => !!x)) {
+					setUserSolutions(convertToUserSolutions(stats));
+					setShowSolutions(true);
+					setExams(exams.map((x) => x!).sort(sortByModule));
+					setSelectedModules(
+						exams
+							.map((x) => x!)
+							.sort(sortByModule)
+							.map((x) => x!.module),
+					);
+					router.push("/exercises");
+				}
+			});
+		};
+
+		const content = (
+			<>
+				<div className="w-full flex justify-between -md:items-center 2xl:items-center">
+					<div className="flex md:flex-col 2xl:flex-row md:gap-1 -md:gap-2 2xl:gap-2 -md:items-center 2xl:items-center">
+						<span className="font-medium">{formatTimestamp(stats[0].date.toString())}</span>
+						{timeSpent && (
+							<>
+								<span className="md:hidden 2xl:flex">• </span>
+								<span className="text-sm">{Math.floor(timeSpent / 60)} minutes</span>
+							</>
+						)}
+					</div>
+					<span
+						className={clsx(
+							correct / total >= 0.7 && "text-mti-purple",
+							correct / total >= 0.3 && correct / total < 0.7 && "text-mti-red",
+							correct / total < 0.3 && "text-mti-rose",
+						)}>
+						Level{" "}
+						{(aggregatedLevels.reduce((accumulator, current) => accumulator + current.level, 0) / aggregatedLevels.length).toFixed(1)}
+					</span>
+				</div>
+
+				<div className="w-full flex flex-col gap-1">
+					<div className="grid grid-cols-4 gap-2 place-items-start w-full -md:mt-2">
+						{aggregatedLevels.map(({module, level}) => (
+							<div
+								key={module}
+								className={clsx(
+									"flex gap-2 items-center w-fit text-white -md:px-4 xl:px-4 md:px-2 py-2 rounded-xl",
+									module === "reading" && "bg-ielts-reading",
+									module === "listening" && "bg-ielts-listening",
+									module === "writing" && "bg-ielts-writing",
+									module === "speaking" && "bg-ielts-speaking",
+								)}>
+								{module === "reading" && <BsBook className="w-4 h-4" />}
+								{module === "listening" && <BsHeadphones className="w-4 h-4" />}
+								{module === "writing" && <BsPen className="w-4 h-4" />}
+								{module === "speaking" && <BsMegaphone className="w-4 h-4" />}
+								<span className="text-sm">{level.toFixed(1)}</span>
+							</div>
+						))}
+					</div>
+				</div>
+			</>
+		);
+
+		return (
+			<div className="flex flex-col gap-2">
+				<span>
+					{(() => {
+						const student = users.find((u) => u.id === user);
+						return `${student?.name} (${student?.email})`;
+					})()}
+				</span>
+				<div
+					key={user}
+					className={clsx(
+						"flex flex-col gap-4 border border-mti-gray-platinum p-4 cursor-pointer rounded-xl transition ease-in-out duration-300 -md:hidden",
+						correct / total >= 0.7 && "hover:border-mti-purple",
+						correct / total >= 0.3 && correct / total < 0.7 && "hover:border-mti-red",
+						correct / total < 0.3 && "hover:border-mti-rose",
+					)}
+					onClick={selectExam}
+					role="button">
+					{content}
+				</div>
+				<div
+					key={user}
+					className={clsx(
+						"flex flex-col gap-4 border border-mti-gray-platinum p-4 cursor-pointer rounded-xl transition ease-in-out duration-300 -md:tooltip md:hidden",
+						correct / total >= 0.7 && "hover:border-mti-purple",
+						correct / total >= 0.3 && correct / total < 0.7 && "hover:border-mti-red",
+						correct / total < 0.3 && "hover:border-mti-rose",
+					)}
+					data-tip="Your screen size is too small to view previous exams."
+					role="button">
+					{content}
+				</div>
+			</div>
+		);
+	};
+
+	return (
+		<Modal isOpen={isOpen} onClose={onClose} title={assignment?.name}>
+			<div className="mt-4 flex flex-col w-full gap-4">
+				<ProgressBar
+					color="purple"
+					label={`${assignment?.results.length}/${assignment?.assignees.length} assignees completed`}
+					className="h-6"
+					textClassName={
+						(assignment?.results.length || 0) / (assignment?.assignees.length || 1) < 0.5 ? "!text-mti-gray-dim font-light" : "text-white"
+					}
+					percentage={((assignment?.results.length || 0) / (assignment?.assignees.length || 1)) * 100}
+				/>
+				<div className="flex gap-8 items-start">
+					<div className="flex flex-col gap-2">
+						<span>Start Date: {moment(assignment?.startDate).format("DD/MM/YY, HH:mm")}</span>
+						<span>End Date: {moment(assignment?.endDate).format("DD/MM/YY, HH:mm")}</span>
+					</div>
+					<span>
+						Assignees:{" "}
+						{users
+							.filter((u) => assignment?.assignees.includes(u.id))
+							.map((u) => `${u.name} (${u.email})`)
+							.join(", ")}
+					</span>
+				</div>
+				<div className="flex flex-col gap-2">
+					<span className="text-xl font-bold">Average Scores</span>
+					<div className="grid grid-cols-4 gap-2 place-items-start w-full -md:mt-2">
+						{assignment?.exams.map(({module}) => (
+							<div
+								key={module}
+								className={clsx(
+									"flex gap-2 items-center w-fit text-white -md:px-4 xl:px-4 md:px-2 py-2 rounded-xl",
+									module === "reading" && "bg-ielts-reading",
+									module === "listening" && "bg-ielts-listening",
+									module === "writing" && "bg-ielts-writing",
+									module === "speaking" && "bg-ielts-speaking",
+								)}>
+								{module === "reading" && <BsBook className="w-4 h-4" />}
+								{module === "listening" && <BsHeadphones className="w-4 h-4" />}
+								{module === "writing" && <BsPen className="w-4 h-4" />}
+								{module === "speaking" && <BsMegaphone className="w-4 h-4" />}
+								{calculateAverageModuleScore(module) > -1 && (
+									<span className="text-sm">{calculateAverageModuleScore(module).toFixed(1)}</span>
+								)}
+							</div>
+						))}
+					</div>
+				</div>
+				<div className="flex flex-col gap-2">
+					<span className="text-xl font-bold">
+						Results ({assignment?.results.length}/{assignment?.assignees.length})
+					</span>
+					<div>
+						{assignment && assignment?.results.length > 0 && (
+							<div className="grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 w-full gap-4 xl:gap-6">
+								{assignment.results.map((r) => customContent(r.stats, r.user, r.type))}
+							</div>
+						)}
+						{assignment && assignment?.results.length === 0 && <span className="font-semibold ml-1">No results yet...</span>}
+					</div>
+				</div>
+			</div>
+		</Modal>
+	);
+}

src/dashboards/Teacher.tsx

@@ -44,6 +44,7 @@ import Button from "@/components/Low/Button";
 import clsx from "clsx";
 import ProgressBar from "@/components/Low/ProgressBar";
 import AssignmentCreator from "./AssignmentCreator";
+import AssignmentView from "./AssignmentView";
 
 interface Props {
 	user: User;
@@ -150,24 +151,14 @@ export default function TeacherDashboard({user}: Props) {
 
 		return (
 			<>
-				<Modal
+				<AssignmentView
 					isOpen={!!selectedAssignment && !isCreatingAssignment}
-					onClose={() => setSelectedAssignment(undefined)}
+					onClose={() => {
-					title={selectedAssignment?.name}>
+						setSelectedAssignment(undefined);
-					<div className="mt-4 flex flex-col w-full">
+						setIsCreatingAssignment(false);
-						<ProgressBar
+					}}
-							color="purple"
+					assignment={selectedAssignment}
-							label={`${selectedAssignment?.results.length}/${selectedAssignment?.assignees.length}`}
-							className="h-6"
-							textClassName={
-								(selectedAssignment?.results.length || 0) / (selectedAssignment?.assignees.length || 1) < 0.5
-									? "!text-mti-gray-dim font-light"
-									: "text-white"
-							}
-							percentage={((selectedAssignment?.results.length || 0) / (selectedAssignment?.assignees.length || 1)) * 100}
 				/>
-					</div>
-				</Modal>
 				<AssignmentCreator
 					assignment={selectedAssignment}
 					groups={groups.filter((x) => x.admin === user.id || x.participants.includes(user.id))}

src/pages/record.tsx

@@ -23,6 +23,7 @@ import Select from "react-select";
 import useGroups from "@/hooks/useGroups";
 import {shouldRedirectHome} from "@/utils/navigation.disabled";
 import useAssignments from "@/hooks/useAssignments";
+import {uuidv4} from "@firebase/util";
 
 export const getServerSideProps = withIronSessionSsr(({req, res}) => {
 	const user = req.session.user;
@@ -57,7 +58,7 @@ export const getServerSideProps = withIronSessionSsr(({req, res}) => {
 export default function History({user}: {user: User}) {
 	const [statsUserId, setStatsUserId] = useState<string | undefined>(user.id);
 	const [groupedStats, setGroupedStats] = useState<{[key: string]: Stat[]}>();
-	const [filter, setFilter] = useState<"months" | "weeks" | "days">();
+	const [filter, setFilter] = useState<"months" | "weeks" | "days" | "assignments">();
 	const {assignments} = useAssignments({});
 
 	const {users} = useUsers();
@@ -73,16 +74,19 @@ export default function History({user}: {user: User}) {
 
 	useEffect(() => {
 		if (stats && !isStatsLoading) {
+			console.log(stats);
 			setGroupedStats(groupByDate(stats));
 		}
 	}, [stats, isStatsLoading]);
 
-	const toggleFilter = (value: "months" | "weeks" | "days") => {
+	const toggleFilter = (value: "months" | "weeks" | "days" | "assignments") => {
 		setFilter((prev) => (prev === value ? undefined : value));
 	};
 
 	const filterStatsByDate = (stats: {[key: string]: Stat[]}) => {
-		if (filter) {
+		console.log(filter);
+
+		if (filter && filter !== "assignments") {
 			const filterDate = moment()
 				.subtract({[filter as string]: 1})
 				.format("x");
@@ -95,6 +99,19 @@ export default function History({user}: {user: User}) {
 			return filteredStats;
 		}
 
+		if (filter && filter === "assignments") {
+			const filteredStats: {[key: string]: Stat[]} = {};
+
+			Object.keys(stats).forEach((timestamp) => {
+				if (stats[timestamp].map((s) => s.assignment === undefined).includes(false))
+					filteredStats[timestamp] = [...stats[timestamp].filter((s) => !!s.assignment)];
+			});
+
+			console.log(filteredStats);
+
+			return filteredStats;
+		}
+
 		return stats;
 	};
 
@@ -234,7 +251,7 @@ export default function History({user}: {user: User}) {
 		return (
 			<>
 				<div
-					key={timestamp}
+					key={uuidv4()}
 					className={clsx(
 						"flex flex-col gap-4 border border-mti-gray-platinum p-4 cursor-pointer rounded-xl transition ease-in-out duration-300 -md:hidden",
 						correct / total >= 0.7 && "hover:border-mti-purple",
@@ -246,7 +263,7 @@ export default function History({user}: {user: User}) {
 					{content}
 				</div>
 				<div
-					key={timestamp}
+					key={uuidv4()}
 					className={clsx(
 						"flex flex-col gap-4 border border-mti-gray-platinum p-4 cursor-pointer rounded-xl transition ease-in-out duration-300 -md:tooltip md:hidden",
 						correct / total >= 0.7 && "hover:border-mti-purple",
@@ -309,6 +326,15 @@ export default function History({user}: {user: User}) {
 							)}
 						</div>
 						<div className="flex gap-4 w-full justify-center xl:justify-end">
+							<button
+								className={clsx(
+									"bg-mti-purple-ultralight text-mti-purple px-4 py-2 rounded-full hover:text-white hover:bg-mti-purple-light",
+									"transition duration-300 ease-in-out",
+									filter === "assignments" && "!bg-mti-purple-light !text-white",
+								)}
+								onClick={() => toggleFilter("assignments")}>
+								Assignments
+							</button>
 							<button
 								className={clsx(
 									"bg-mti-purple-ultralight text-mti-purple px-4 py-2 rounded-full hover:text-white hover:bg-mti-purple-light",