Solved some problems with the excel of master statistical

src/dashboards/Corporate/index.tsx

@@ -1,22 +1,12 @@
 /* eslint-disable @next/next/no-img-element */
 import Modal from "@/components/Modal";
 import useFilterRecordsByUser from "@/hooks/useFilterRecordsByUser";
-import useUsers, {
+import useUsers, {userHashStudent, userHashTeacher, userHashCorporate} from "@/hooks/useUsers";
-  userHashStudent,
+import {CorporateUser, Group, MasterCorporateUser, Stat, User} from "@/interfaces/user";
-  userHashTeacher,
-  userHashCorporate,
-} from "@/hooks/useUsers";
-import {
-  CorporateUser,
-  Group,
-  MasterCorporateUser,
-  Stat,
-  User,
-} from "@/interfaces/user";
 import UserList from "@/pages/(admin)/Lists/UserList";
-import { dateSorter } from "@/utils";
+import {dateSorter} from "@/utils";
 import moment from "moment";
-import { useEffect, useMemo, useState } from "react";
+import {useEffect, useMemo, useState} from "react";
 import {
 	BsArrowLeft,
 	BsClipboard2Data,
@@ -40,36 +30,27 @@ import {
 } from "react-icons/bs";
 import UserCard from "@/components/UserCard";
 import useGroups from "@/hooks/useGroups";
-import {
+import {averageLevelCalculator, calculateAverageLevel, calculateBandScore} from "@/utils/score";
-  averageLevelCalculator,
+import {MODULE_ARRAY} from "@/utils/moduleUtils";
-  calculateAverageLevel,
+import {Module} from "@/interfaces";
-  calculateBandScore,
+import {groupByExam} from "@/utils/stats";
-} from "@/utils/score";
-import { MODULE_ARRAY } from "@/utils/moduleUtils";
-import { Module } from "@/interfaces";
-import { groupByExam } from "@/utils/stats";
 import IconCard from "../IconCard";
 import GroupList from "@/pages/(admin)/Lists/GroupList";
 import useFilterStore from "@/stores/listFilterStore";
-import { useRouter } from "next/router";
+import {useRouter} from "next/router";
 import useCodes from "@/hooks/useCodes";
-import { getUserCorporate } from "@/utils/groups";
+import {getUserCorporate} from "@/utils/groups";
 import useAssignments from "@/hooks/useAssignments";
-import { Assignment } from "@/interfaces/results";
+import {Assignment} from "@/interfaces/results";
 import AssignmentView from "../AssignmentView";
 import AssignmentCreator from "../AssignmentCreator";
 import clsx from "clsx";
 import AssignmentCard from "../AssignmentCard";
-import { createColumnHelper } from "@tanstack/react-table";
+import {createColumnHelper} from "@tanstack/react-table";
 import Checkbox from "@/components/Low/Checkbox";
 import List from "@/components/List";
-import { getUserCompanyName } from "@/resources/user";
+import {getUserCompanyName} from "@/resources/user";
-import {
+import {futureAssignmentFilter, pastAssignmentFilter, archivedAssignmentFilter, activeAssignmentFilter} from "@/utils/assignments";
-  futureAssignmentFilter,
-  pastAssignmentFilter,
-  archivedAssignmentFilter,
-  activeAssignmentFilter,
-} from "@/utils/assignments";
 import useUserBalance from "@/hooks/useUserBalance";
 import AssignmentsPage from "../views/AssignmentsPage";
 import StudentPerformancePage from "./StudentPerformancePage";
@@ -92,42 +73,24 @@ const teacherHash = {
 	size: 25,
 };
 
-export default function CorporateDashboard({ user, linkedCorporate }: Props) {
+export default function CorporateDashboard({user, linkedCorporate}: Props) {
 	const [selectedUser, setSelectedUser] = useState<User>();
 	const [showModal, setShowModal] = useState(false);
 
-  const { data: stats } = useFilterRecordsByUser<Stat[]>();
+	const {data: stats} = useFilterRecordsByUser<Stat[]>();
-  const { groups } = useGroups({ admin: user.id });
+	const {groups} = useGroups({admin: user.id});
-  const {
+	const {assignments, isLoading: isAssignmentsLoading, reload: reloadAssignments} = useAssignments({corporate: user.id});
-    assignments,
+	const {balance} = useUserBalance();
-    isLoading: isAssignmentsLoading,
-    reload: reloadAssignments,
-  } = useAssignments({ corporate: user.id });
-  const { balance } = useUserBalance();
 
-  const {
+	useEffect(() => console.log(assignments), [assignments]);
-    users: students,
+
-    total: totalStudents,
+	const {users: students, total: totalStudents, reload: reloadStudents, isLoading: isStudentsLoading} = useUsers(studentHash);
-    reload: reloadStudents,
+	const {users: teachers, total: totalTeachers, reload: reloadTeachers, isLoading: isTeachersLoading} = useUsers(teacherHash);
-    isLoading: isStudentsLoading,
-  } = useUsers(studentHash);
-  const {
-    users: teachers,
-    total: totalTeachers,
-    reload: reloadTeachers,
-    isLoading: isTeachersLoading,
-  } = useUsers(teacherHash);
 
 	const appendUserFilters = useFilterStore((state) => state.appendUserFilter);
 	const router = useRouter();
 
-  const assignmentsGroups = useMemo(
+	const assignmentsGroups = useMemo(() => groups.filter((x) => x.admin === user.id || x.participants.includes(user.id)), [groups, user.id]);
-    () =>
-      groups.filter(
-        (x) => x.admin === user.id || x.participants.includes(user.id)
-      ),
-    [groups, user.id]
-  );
 
 	const assignmentsUsers = useMemo(
 		() =>
@@ -137,28 +100,22 @@ export default function CorporateDashboard({ user, linkedCorporate }: Props) {
 							.filter((g) => g.admin === selectedUser.id)
 							.flatMap((g) => g.participants)
 							.includes(x.id) || false
-          : groups.flatMap((g) => g.participants).includes(x.id)
+					: groups.flatMap((g) => g.participants).includes(x.id),
 			),
-    [groups, teachers, students, selectedUser]
+		[groups, teachers, students, selectedUser],
 	);
 
 	useEffect(() => {
 		setShowModal(!!selectedUser && router.asPath === "/#");
 	}, [selectedUser, router.asPath]);
 
-  const getStatsByStudent = (user: User) =>
+	const getStatsByStudent = (user: User) => stats.filter((s) => s.user === user.id);
-    stats.filter((s) => s.user === user.id);
 
 	const UserDisplay = (displayUser: User) => (
 		<div
 			onClick={() => setSelectedUser(displayUser)}
-      className="flex w-full p-4 gap-4 items-center hover:bg-mti-purple-ultralight cursor-pointer transition ease-in-out duration-300"
+			className="flex w-full p-4 gap-4 items-center hover:bg-mti-purple-ultralight cursor-pointer transition ease-in-out duration-300">
-    >
+			<img src={displayUser.profilePicture} alt={displayUser.name} className="rounded-full w-10 h-10" />
-      <img
-        src={displayUser.profilePicture}
-        alt={displayUser.name}
-        className="rounded-full w-10 h-10"
-      />
 			<div className="flex flex-col gap-1 items-start">
 				<span>{displayUser.name}</span>
 				<span className="text-sm opacity-75">{displayUser.email}</span>
@@ -170,55 +127,41 @@ export default function CorporateDashboard({ user, linkedCorporate }: Props) {
 	// while still being able to use the corporate user
 	const groupedByNameCorporateIds = useMemo(
 		() => ({
-      [user.corporateInformation?.companyInformation?.name || user.name]: [
+			[user.corporateInformation?.companyInformation?.name || user.name]: [user.id],
-        user.id,
-      ],
 		}),
-    [user]
+		[user],
-  );
-  const teachersAndStudents = useMemo(
-    () => [...students, ...teachers],
-    [students, teachers]
 	);
+	const teachersAndStudents = useMemo(() => [...students, ...teachers], [students, teachers]);
 	const MasterStatisticalPage = () => {
 		return (
 			<>
 				<div className="flex flex-col gap-4">
 					<div
 						onClick={() => router.push("/")}
-            className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
+						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-          >
 						<BsArrowLeft className="text-xl" />
 						<span>Back</span>
 					</div>
 					<h2 className="text-2xl font-semibold">Master Statistical</h2>
 				</div>
-        <MasterStatistical
+				<MasterStatistical users={teachersAndStudents} corporateUsers={groupedByNameCorporateIds} displaySelection={false} />
-          users={teachersAndStudents}
-          corporateUsers={groupedByNameCorporateIds}
-          displaySelection={false}
-        />
 			</>
 		);
 	};
 
 	const GroupsList = () => {
-    const filter = (x: Group) =>
+		const filter = (x: Group) => x.admin === user.id || x.participants.includes(user.id);
-      x.admin === user.id || x.participants.includes(user.id);
 
 		return (
 			<>
 				<div className="flex flex-col gap-4">
 					<div
 						onClick={() => router.push("/")}
-            className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
+						className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-          >
 						<BsArrowLeft className="text-xl" />
 						<span>Back</span>
 					</div>
-          <h2 className="text-2xl font-semibold">
+					<h2 className="text-2xl font-semibold">Groups ({groups.filter(filter).length})</h2>
-            Groups ({groups.filter(filter).length})
-          </h2>
 				</div>
 
 				<GroupList user={user} />
@@ -236,15 +179,10 @@ export default function CorporateDashboard({ user, linkedCorporate }: Props) {
 			.filter((f) => !!f.focus);
 		const bandScores = formattedStats.map((s) => ({
 			module: s.module,
-      level: calculateBandScore(
+			level: calculateBandScore(s.score.correct, s.score.total, s.module, s.focus!),
-        s.score.correct,
-        s.score.total,
-        s.module,
-        s.focus!
-      ),
 		}));
 
-    const levels: { [key in Module]: number } = {
+		const levels: {[key in Module]: number} = {
 			reading: 0,
 			listening: 0,
 			writing: 0,
@@ -265,8 +203,7 @@ export default function CorporateDashboard({ user, linkedCorporate }: Props) {
 					<div className="flex flex-col gap-4">
 						<div
 							onClick={() => router.push("/")}
-              className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
+							className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-            >
 							<BsArrowLeft className="text-xl" />
 							<span>Back</span>
 						</div>
@@ -285,8 +222,7 @@ export default function CorporateDashboard({ user, linkedCorporate }: Props) {
 					<div className="flex flex-col gap-4">
 						<div
 							onClick={() => router.push("/")}
-              className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
+							className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-            >
 							<BsArrowLeft className="text-xl" />
 							<span>Back</span>
 						</div>
@@ -297,8 +233,7 @@ export default function CorporateDashboard({ user, linkedCorporate }: Props) {
 		);
 
 	if (router.asPath === "/#groups") return <GroupsList />;
-  if (router.asPath === "/#studentsPerformance")
+	if (router.asPath === "/#studentsPerformance") return <StudentPerformancePage user={user} />;
-    return <StudentPerformancePage user={user} />;
 
 	if (router.asPath === "/#assignments")
 		return (
@@ -324,14 +259,11 @@ export default function CorporateDashboard({ user, linkedCorporate }: Props) {
 								loggedInUser={user}
 								onClose={(shouldReload) => {
 									setSelectedUser(undefined);
-                  if (shouldReload && selectedUser!.type === "student")
+									if (shouldReload && selectedUser!.type === "student") reloadStudents();
-                    reloadStudents();
+									if (shouldReload && selectedUser!.type === "teacher") reloadTeachers();
-                  if (shouldReload && selectedUser!.type === "teacher")
-                    reloadTeachers();
 								}}
 								onViewStudents={
-                  selectedUser.type === "corporate" ||
+									selectedUser.type === "corporate" || selectedUser.type === "teacher"
-                  selectedUser.type === "teacher"
 										? () => {
 												appendUserFilters({
 													id: "view-students",
@@ -341,11 +273,7 @@ export default function CorporateDashboard({ user, linkedCorporate }: Props) {
 													id: "belongs-to-admin",
 													filter: (x: User) =>
 														groups
-                              .filter(
+															.filter((g) => g.admin === selectedUser.id || g.participants.includes(selectedUser.id))
-                                (g) =>
-                                  g.admin === selectedUser.id ||
-                                  g.participants.includes(selectedUser.id)
-                              )
 															.flatMap((g) => g.participants)
 															.includes(x.id),
 												});
@@ -355,8 +283,7 @@ export default function CorporateDashboard({ user, linkedCorporate }: Props) {
 										: undefined
 								}
 								onViewTeachers={
-                  selectedUser.type === "corporate" ||
+									selectedUser.type === "corporate" || selectedUser.type === "student"
-                  selectedUser.type === "student"
 										? () => {
 												appendUserFilters({
 													id: "view-teachers",
@@ -366,11 +293,7 @@ export default function CorporateDashboard({ user, linkedCorporate }: Props) {
 													id: "belongs-to-admin",
 													filter: (x: User) =>
 														groups
-                              .filter(
+															.filter((g) => g.admin === selectedUser.id || g.participants.includes(selectedUser.id))
-                                (g) =>
-                                  g.admin === selectedUser.id ||
-                                  g.participants.includes(selectedUser.id)
-                              )
 															.flatMap((g) => g.participants)
 															.includes(x.id),
 												});
@@ -389,11 +312,7 @@ export default function CorporateDashboard({ user, linkedCorporate }: Props) {
 			<>
 				{!!linkedCorporate && (
 					<div className="absolute top-4 right-4 bg-neutral-200 px-2 rounded-lg py-1">
-            Linked to:{" "}
+						Linked to: <b>{linkedCorporate?.corporateInformation?.companyInformation.name || linkedCorporate.name}</b>
-            <b>
-              {linkedCorporate?.corporateInformation?.companyInformation.name ||
-                linkedCorporate.name}
-            </b>
 					</div>
 				)}
 				<section className="grid grid-cols-5 -md:grid-cols-2 gap-4 text-center">
@@ -416,47 +335,27 @@ export default function CorporateDashboard({ user, linkedCorporate }: Props) {
 					<IconCard
 						Icon={BsClipboard2Data}
 						label="Exams Performed"
-            value={
+						value={stats.filter((s) => groups.flatMap((g) => g.participants).includes(s.user)).length}
-              stats.filter((s) =>
-                groups.flatMap((g) => g.participants).includes(s.user)
-              ).length
-            }
 						color="purple"
 					/>
 					<IconCard
 						Icon={BsPaperclip}
 						isLoading={isStudentsLoading}
 						label="Average Level"
-            value={averageLevelCalculator(
+						value={averageLevelCalculator(stats.filter((s) => groups.flatMap((g) => g.participants).includes(s.user))).toFixed(1)}
-              stats.filter((s) =>
-                groups.flatMap((g) => g.participants).includes(s.user)
-              )
-            ).toFixed(1)}
-            color="purple"
-          />
-          <IconCard
-            onClick={() => router.push("/#groups")}
-            Icon={BsPeople}
-            label="Groups"
-            value={groups.length}
 						color="purple"
 					/>
+					<IconCard onClick={() => router.push("/#groups")} Icon={BsPeople} label="Groups" value={groups.length} color="purple" />
 					<IconCard
 						Icon={BsPersonCheck}
 						label="User Balance"
-            value={`${balance}/${
+						value={`${balance}/${user.corporateInformation?.companyInformation?.userAmount || 0}`}
-              user.corporateInformation?.companyInformation?.userAmount || 0
-            }`}
 						color="purple"
 					/>
 					<IconCard
 						Icon={BsClock}
 						label="Expiration Date"
-            value={
+						value={user.subscriptionExpirationDate ? moment(user.subscriptionExpirationDate).format("DD/MM/yyyy") : "Unlimited"}
-              user.subscriptionExpirationDate
-                ? moment(user.subscriptionExpirationDate).format("DD/MM/yyyy")
-                : "Unlimited"
-            }
 						color="rose"
 					/>
 					<IconCard
@@ -467,24 +366,16 @@ export default function CorporateDashboard({ user, linkedCorporate }: Props) {
 						color="purple"
 						onClick={() => router.push("/#studentsPerformance")}
 					/>
-          <IconCard
+					<IconCard Icon={BsDatabase} label="Master Statistical" color="purple" onClick={() => router.push("/#statistical")} />
-            Icon={BsDatabase}
-            label="Master Statistical"
-            color="purple"
-            onClick={() => router.push("/#statistical")}
-          />
 					<button
 						disabled={isAssignmentsLoading}
 						onClick={() => router.push("/#assignments")}
-            className="bg-white col-span-2 rounded-xl shadow p-4 flex flex-col gap-4 items-center w-96 h-52 justify-center cursor-pointer hover:shadow-xl transition ease-in-out duration-300"
+						className="bg-white col-span-2 rounded-xl shadow p-4 flex flex-col gap-4 items-center w-96 h-52 justify-center cursor-pointer hover:shadow-xl transition ease-in-out duration-300">
-          >
 						<BsEnvelopePaper className="text-6xl text-mti-purple-light" />
 						<span className="flex flex-col gap-1 items-center text-xl">
 							<span className="text-lg">Assignments</span>
 							<span className="font-semibold text-mti-purple-light">
-                {isAssignmentsLoading
+								{isAssignmentsLoading ? "Loading..." : assignments.filter((a) => !a.archived).length}
-                  ? "Loading..."
-                  : assignments.filter((a) => !a.archived).length}
 							</span>
 						</span>
 					</button>
@@ -515,11 +406,7 @@ export default function CorporateDashboard({ user, linkedCorporate }: Props) {
 						<span className="p-4">Highest level students</span>
 						<div className="flex flex-col items-start h-96 overflow-scroll scrollbar-hide">
 							{students
-                .sort(
+								.sort((a, b) => calculateAverageLevel(b.levels) - calculateAverageLevel(a.levels))
-                  (a, b) =>
-                    calculateAverageLevel(b.levels) -
-                    calculateAverageLevel(a.levels)
-                )
 								.map((x) => (
 									<UserDisplay key={x.id} {...x} />
 								))}
@@ -531,8 +418,7 @@ export default function CorporateDashboard({ user, linkedCorporate }: Props) {
 							{students
 								.sort(
 									(a, b) =>
-                    Object.keys(groupByExam(getStatsByStudent(b))).length -
+										Object.keys(groupByExam(getStatsByStudent(b))).length - Object.keys(groupByExam(getStatsByStudent(a))).length,
-                    Object.keys(groupByExam(getStatsByStudent(a))).length
 								)
 								.map((x) => (
 									<UserDisplay key={x.id} {...x} />

src/dashboards/MasterCorporate/MasterStatistical.tsx

@@ -75,7 +75,7 @@ const MasterStatistical = (props: Props) => {
 			assignments.reduce((accmA: TableData[], a: AssignmentWithCorporateId) => {
 				const userResults = a.assignees.map((assignee) => {
 					const userData = users.find((u) => u.id === assignee);
-					const userStats = !!userData ? a.results.find((r) => r.user === assignee)?.stats || [] : [];
+					const userStats = a.results.find((r) => r.user === assignee)?.stats || [];
 					const corporate = getUserName(users.find((u) => u.id === a.assigner));
 					const commonData = {
 						user: userData,
@@ -109,8 +109,6 @@ const MasterStatistical = (props: Props) => {
 		[assignments, users],
 	);
 
-	useEffect(() => console.log(assignments), [assignments]);
-
 	const getCorporateScores = (corporateId: string): UserCount => {
 		const corporateAssignmentsUsers = assignments.filter((a) => a.corporateId === corporateId).reduce((acc, a) => acc + a.assignees.length, 0);
 

src/dashboards/views/AssignmentsPage.tsx

@@ -55,7 +55,7 @@ export default function AssignmentsPage({assignments, corporateAssignments, user
 				<AssignmentCreator
 					assignment={selectedAssignment}
 					groups={groups}
-					users={users}
+					users={[...users, user]}
 					user={user}
 					isCreating={isCreatingAssignment}
 					cancelCreation={() => {

src/hooks/useUsers.tsx

@@ -23,8 +23,6 @@ export default function useUsers(props?: {type?: string; page?: number; size?: n
 				if (props[key as keyof typeof props] !== undefined) params.append(key, props[key as keyof typeof props]!.toString());
 			});
 
-		console.log(params.toString());
-
 		setIsLoading(true);
 		axios
 			.get<{users: User[]; total: number}>(`/api/users/list?${params.toString()}`, {headers: {page: "register"}})

src/pages/api/assignments/statistical/excel.ts

@@ -14,12 +14,18 @@ import {getGradingSystem} from "@/utils/grading.be";
 import {StudentUser, User} from "@/interfaces/user";
 import {calculateBandScore, getGradingLabel} from "@/utils/score";
 import {Module} from "@/interfaces";
+import {uniq} from "lodash";
+import {getUserName} from "@/utils/users";
+import {LevelExam} from "@/interfaces/exam";
+import {getSpecificExams} from "@/utils/exams.be";
 
 export default withIronSessionApiRoute(handler, sessionOptions);
 
 interface TableData {
 	user: string;
 	studentID: string;
+	passportID: string;
+	exams: string;
 	email: string;
 	correct: number;
 	corporate: string;
@@ -41,7 +47,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
 	if (req.method === "POST") return await post(req, res);
 }
 
-const searchFilters = [["email"], ["user"], ["userId"]];
+const searchFilters = [["email"], ["user"], ["userId"], ["assignment"], ["exams"]];
 
 async function post(req: NextApiRequest, res: NextApiResponse) {
 	// verify if it's a logged user that is trying to export
@@ -66,10 +72,11 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
 		const endDateParsed = endDate ? new Date(endDate) : undefined;
 		const assignments = await getAssignmentsForCorporates(req.session.user.type, ids, startDateParsed, endDateParsed);
 
-		const assignmentUsers = [...new Set(assignments.flatMap((a) => a.assignees))];
+		const assignmentUsers = uniq([...assignments.flatMap((x) => x.assignees), ...assignments.flatMap((x) => x.assigner)]);
 		const assigners = [...new Set(assignments.map((a) => a.assigner))];
 		const users = await getSpecificUsers(assignmentUsers);
 		const assignerUsers = await getSpecificUsers(assigners);
+		const exams = await getSpecificExams(uniq(assignments.flatMap((x) => x.exams.map((x) => x.id))));
 
 		const assignerUsersGradingSystems = await Promise.all(
 			assignerUsers.map(async (user: User) => {
@@ -91,7 +98,7 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
 				if (gradingSystem) {
 					const bandScore = calculateBandScore(correct, total, "level", user?.focus || "academic");
 					return {
-						label: getGradingLabel(bandScore, gradingSystem?.steps || []),
+						label: getGradingLabel(bandScore, gradingSystem.steps || []),
 						score: bandScore,
 					};
 				}
@@ -113,10 +120,12 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
 					const commonData = {
 						user: userData?.name || "",
 						email: userData?.email || "",
-						studentID: (userData as StudentUser).studentID || "",
+						studentID: (userData as StudentUser)?.studentID || "",
+						passportID: (userData as StudentUser)?.demographicInformation?.passport_id || "",
 						userId: assignee,
+						exams: a.exams.map((x) => x.id).join(", "),
 						corporateId: a.corporateId,
-						corporate: corporateUser?.name || "",
+						corporate: !corporateUser ? "" : getUserName(corporateUser),
 						assignment: a.name,
 						level,
 						score,
@@ -130,14 +139,22 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
 						};
 					}
 
-					const partsData = userStats.every((e) => e.module === "level")
+					let data: {total: number; correct: number}[] = [];
-						? userStats.reduce((acc, e, index) => {
+					if (a.exams.every((x) => x.module === "level")) {
-								return {
+						const exam = exams.find((x) => x.id === a.exams.find((x) => x.assignee === assignee)?.id) as LevelExam;
-									...acc,
+						data = exam.parts.map((x) => {
-									[`part${index}`]: `${e.score.correct}/${e.score.total}`,
+							const exerciseIDs = x.exercises.map((x) => x.id);
-								};
+							const stats = userStats.filter((x) => exerciseIDs.includes(x.exercise));
-						  }, {})
+
-						: {};
+							const total = stats.reduce((acc, curr) => acc + curr.score.total, 0);
+							const correct = stats.reduce((acc, curr) => acc + curr.score.correct, 0);
+
+							return {total, correct};
+						});
+					}
+
+					const partsData =
+						data.length > 0 ? data.reduce((acc, e, index) => ({...acc, [`part${index}`]: `${e.correct}/${e.total}`}), {}) : {};
 
 					return {
 						...commonData,
@@ -169,6 +186,10 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
 				label: "Student ID",
 				value: (entry: TableData) => entry.studentID,
 			},
+			{
+				label: "Passport ID",
+				value: (entry: TableData) => entry.passportID,
+			},
 			...(displaySelection
 				? [
 						{
@@ -186,7 +207,7 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
 				value: (entry: TableData) => (entry.submitted ? "Yes" : "No"),
 			},
 			{
-				label: "Correct",
+				label: "Score",
 				value: (entry: TableData) => entry.correct,
 			},
 			{
@@ -206,7 +227,7 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
 			})),
 		];
 
-		const filteredSearch = searchText ? search(searchText, searchFilters, tableResults) : tableResults;
+		const filteredSearch = !!searchText ? search(searchText, searchFilters, tableResults) : tableResults;
 
 		worksheet.addRow(headers.map((h) => h.label));
 		(filteredSearch as TableData[]).forEach((entry) => {

src/pages/api/users/list.ts

@@ -4,6 +4,7 @@ import {withIronSessionApiRoute} from "iron-session/next";
 import {sessionOptions} from "@/lib/session";
 import {getLinkedUsers} from "@/utils/users.be";
 import {Type} from "@/interfaces/user";
+import {uniqBy} from "lodash";
 
 export default withIronSessionApiRoute(handler, sessionOptions);
 
@@ -31,5 +32,5 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
 		direction,
 	);
 
-	res.status(200).json({users, total});
+	res.status(200).json({users: uniqBy([...users, req.session.user], "id"), total});
 }

src/utils/exams.be.ts

@@ -6,6 +6,28 @@ import {Module} from "@/interfaces";
 import {getCorporateUser} from "@/resources/user";
 import {getUserCorporate} from "./groups.be";
 import {Db, ObjectId} from "mongodb";
+import client from "@/lib/mongodb";
+import {MODULE_ARRAY} from "./moduleUtils";
+
+const db = client.db(process.env.MONGODB_DB);
+
+export async function getSpecificExams(ids: string[]) {
+	if (ids.length === 0) return [];
+
+	const exams: Exam[] = (
+		await Promise.all(
+			MODULE_ARRAY.flatMap(
+				async (module) =>
+					await db
+						.collection(module)
+						.find<Exam>({id: {$in: ids}})
+						.toArray(),
+			),
+		)
+	).flat();
+
+	return exams;
+}
 
 export const getExams = async (
 	db: Db,

src/utils/search.ts

@@ -1,4 +1,3 @@
-
 /*fields example = [
     ['id'],
     ['companyInformation', 'companyInformation', 'name']
@@ -18,6 +17,7 @@ export const search = (text: string, fields: string[][], rows: any[]) => {
 		return fields.some((fieldsKeys) => {
 			const value = getFieldValue(fieldsKeys, row);
 			if (typeof value === "string") {
+				console.log(value, searchText, value.toLowerCase().includes(searchText));
 				return value.toLowerCase().includes(searchText);
 			}
 
@@ -26,4 +26,4 @@ export const search = (text: string, fields: string[][], rows: any[]) => {
 			}
 		});
 	});
-}
+};