Merge branch 'main' into develop

src/components/List.tsx

@@ -1,14 +1,37 @@
 import {Column, flexRender, getCoreRowModel, getSortedRowModel, useReactTable} from "@tanstack/react-table";
+import {useMemo, useState} from "react";
+import Button from "./Low/Button";
+
+const SIZE = 25;
 
 export default function List<T>({data, columns}: {data: T[]; columns: any[]}) {
+	const [page, setPage] = useState(0);
+
+	const items = useMemo(() => data.slice(page * SIZE, (page + 1) * SIZE > data.length ? data.length : (page + 1) * SIZE), [data, page]);
+
 	const table = useReactTable({
-		data,
+		data: items,
 		columns: columns,
 		getCoreRowModel: getCoreRowModel(),
 		getSortedRowModel: getSortedRowModel(),
 	});
 
 	return (
+		<div className="w-full h-full flex flex-col gap-2">
+			<div className="w-full flex gap-2 justify-between">
+				<Button className="w-full max-w-[200px]" disabled={page === 0} onClick={() => setPage((prev) => prev - 1)}>
+					Previous Page
+				</Button>
+				<div className="flex items-center gap-4 w-fit">
+					<span className="opacity-80">
+						{page * SIZE + 1} - {(page + 1) * SIZE > data.length ? data.length : (page + 1) * SIZE} / {data.length}
+					</span>
+					<Button className="w-[200px]" disabled={(page + 1) * SIZE >= data.length} onClick={() => setPage((prev) => prev + 1)}>
+						Next Page
+					</Button>
+				</div>
+			</div>
+
 			<table className="rounded-xl bg-mti-purple-ultralight/40 w-full">
 				<thead>
 					{table.getHeaderGroups().map((headerGroup) => (
@@ -19,7 +42,9 @@ export default function List<T>({data, columns}: {data: T[]; columns: any[]}) {
 										<>
 											<div
 												{...{
-												className: header.column.getCanSort() ? "cursor-pointer select-none py-4 text-left first:pl-4" : "",
+													className: header.column.getCanSort()
+														? "cursor-pointer select-none py-4 text-left first:pl-4"
+														: "",
 													onClick: header.column.getToggleSortingHandler(),
 												}}>
 												{flexRender(header.column.columnDef.header, header.getContext())}
@@ -47,5 +72,6 @@ export default function List<T>({data, columns}: {data: T[]; columns: any[]}) {
 					))}
 				</tbody>
 			</table>
+		</div>
 	);
 }

src/dashboards/Admin.tsx

@@ -63,7 +63,7 @@ export default function AdminDashboard({user}: Props) {
 	const {users: students, total: totalStudents, reload: reloadStudents, isLoading: isStudentsLoading} = useUsers(studentHash);
 	const {users: teachers, total: totalTeachers, reload: reloadTeachers, isLoading: isTeachersLoading} = useUsers(teacherHash);
 	const {users: corporates, total: totalCorporate, reload: reloadCorporates, isLoading: isCorporatesLoading} = useUsers(corporateHash);
-	const {users: agents, total: totalAgents, reload: reloadAgents, isLoading: isAgentsLoading} = useUsers(corporateHash);
+	const {users: agents, total: totalAgents, reload: reloadAgents, isLoading: isAgentsLoading} = useUsers(agentsHash);
 
 	const {groups} = useGroups({});
 	const {pending, done} = usePaymentStatusUsers();

src/dashboards/AssignmentCreator.tsx

@@ -21,6 +21,7 @@ import Checkbox from "@/components/Low/Checkbox";
 import {InstructorGender, Variant} from "@/interfaces/exam";
 import Select from "@/components/Low/Select";
 import useExams from "@/hooks/useExams";
+import {useListSearch} from "@/hooks/useListSearch";
 
 interface Props {
 	isCreating: boolean;
@@ -31,7 +32,12 @@ interface Props {
 	cancelCreation: () => void;
 }
 
+const SIZE = 12;
+
 export default function AssignmentCreator({isCreating, assignment, user, groups, users, cancelCreation}: Props) {
+	const [studentsPage, setStudentsPage] = useState(0);
+	const [teachersPage, setTeachersPage] = useState(0);
+
 	const [selectedModules, setSelectedModules] = useState<Module[]>(assignment?.exams.map((e) => e.module) || []);
 	const [assignees, setAssignees] = useState<string[]>(assignment?.assignees || []);
 	const [teachers, setTeachers] = useState<string[]>(!!assignment ? assignment.teachers || [] : [...(user.type === "teacher" ? [user.id] : [])]);
@@ -69,6 +75,29 @@ export default function AssignmentCreator({isCreating, assignment, user, groups,
 	const userStudents = useMemo(() => users.filter((x) => x.type === "student"), [users]);
 	const userTeachers = useMemo(() => users.filter((x) => x.type === "teacher"), [users]);
 
+	const {rows: filteredStudentsRows, renderSearch: renderStudentSearch, text: studentText} = useListSearch([["name"], ["email"]], userStudents);
+	const {rows: filteredTeachersRows, renderSearch: renderTeacherSearch, text: teacherText} = useListSearch([["name"], ["email"]], userTeachers);
+
+	useEffect(() => setStudentsPage(0), [studentText]);
+	const studentRows = useMemo(
+		() =>
+			filteredStudentsRows.slice(
+				studentsPage * SIZE,
+				(studentsPage + 1) * SIZE > filteredStudentsRows.length ? filteredStudentsRows.length : (studentsPage + 1) * SIZE,
+			),
+		[filteredStudentsRows, studentsPage],
+	);
+
+	useEffect(() => setTeachersPage(0), [teacherText]);
+	const teacherRows = useMemo(
+		() =>
+			filteredTeachersRows.slice(
+				teachersPage * SIZE,
+				(teachersPage + 1) * SIZE > filteredTeachersRows.length ? filteredTeachersRows.length : (teachersPage + 1) * SIZE,
+			),
+		[filteredTeachersRows, teachersPage],
+	);
+
 	useEffect(() => {
 		setExamIDs((prev) => prev.filter((x) => selectedModules.includes(x.module)));
 	}, [selectedModules]);
@@ -347,9 +376,9 @@ export default function AssignmentCreator({isCreating, assignment, user, groups,
 					</div>
 				)}
 
-				<section className="w-full flex flex-col gap-3">
+				<section className="w-full flex flex-col gap-4">
 					<span className="font-semibold">Assignees ({assignees.length} selected)</span>
-					<div className="flex gap-4 overflow-x-scroll scrollbar-hide">
+					<div className="grid grid-cols-5 gap-4">
 						{groups.map((g) => (
 							<button
 								key={g.id}
@@ -371,8 +400,11 @@ export default function AssignmentCreator({isCreating, assignment, user, groups,
 							</button>
 						))}
 					</div>
+
+					{renderStudentSearch()}
+
 					<div className="flex flex-wrap -md:justify-center gap-4">
-						{userStudents.map((user) => (
+						{studentRows.map((user) => (
 							<div
 								onClick={() => toggleAssignee(user)}
 								className={clsx(
@@ -402,12 +434,32 @@ export default function AssignmentCreator({isCreating, assignment, user, groups,
 							</div>
 						))}
 					</div>
+					<div className="w-full flex gap-2 justify-between items-center">
+						<div className="flex items-center gap-4 w-fit">
+							<Button className="w-[200px] h-fit" disabled={studentsPage === 0} onClick={() => setStudentsPage((prev) => prev - 1)}>
+								Previous Page
+							</Button>
+						</div>
+						<div className="flex items-center gap-4 w-fit">
+							<span className="opacity-80">
+								{studentsPage * SIZE + 1} -{" "}
+								{(studentsPage + 1) * SIZE > filteredStudentsRows.length ? filteredStudentsRows.length : (studentsPage + 1) * SIZE} /{" "}
+								{filteredStudentsRows.length}
+							</span>
+							<Button
+								className="w-[200px]"
+								disabled={(studentsPage + 1) * SIZE >= filteredStudentsRows.length}
+								onClick={() => setStudentsPage((prev) => prev + 1)}>
+								Next Page
+							</Button>
+						</div>
+					</div>
 				</section>
 
 				{user.type !== "teacher" && (
 					<section className="w-full flex flex-col gap-3">
 						<span className="font-semibold">Teachers ({teachers.length} selected)</span>
-						<div className="flex gap-4 overflow-x-scroll scrollbar-hide">
+						<div className="grid grid-cols-5 gap-4">
 							{groups.map((g) => (
 								<button
 									key={g.id}
@@ -429,8 +481,11 @@ export default function AssignmentCreator({isCreating, assignment, user, groups,
 								</button>
 							))}
 						</div>
+
+						{renderTeacherSearch()}
+
 						<div className="flex flex-wrap -md:justify-center gap-4">
-							{userTeachers.map((user) => (
+							{teacherRows.map((user) => (
 								<div
 									onClick={() => toggleTeacher(user)}
 									className={clsx(
@@ -453,6 +508,29 @@ export default function AssignmentCreator({isCreating, assignment, user, groups,
 								</div>
 							))}
 						</div>
+
+						<div className="w-full flex gap-2 justify-between items-center">
+							<div className="flex items-center gap-4 w-fit">
+								<Button className="w-[200px] h-fit" disabled={teachersPage === 0} onClick={() => setTeachersPage((prev) => prev - 1)}>
+									Previous Page
+								</Button>
+							</div>
+							<div className="flex items-center gap-4 w-fit">
+								<span className="opacity-80">
+									{teachersPage * SIZE + 1} -{" "}
+									{(teachersPage + 1) * SIZE > filteredTeachersRows.length
+										? filteredTeachersRows.length
+										: (teachersPage + 1) * SIZE}{" "}
+									/ {filteredTeachersRows.length}
+								</span>
+								<Button
+									className="w-[200px]"
+									disabled={(teachersPage + 1) * SIZE >= filteredTeachersRows.length}
+									onClick={() => setTeachersPage((prev) => prev + 1)}>
+									Next Page
+								</Button>
+							</div>
+						</div>
 					</section>
 				)}
 

src/dashboards/MasterCorporate/MasterStatistical.tsx

@@ -1,5 +1,5 @@
-import React from "react";
+import React, {useEffect, useMemo, useState} from "react";
-import {CorporateUser, User} from "@/interfaces/user";
+import {CorporateUser, StudentUser, User} from "@/interfaces/user";
 import {BsFileExcel, BsBank, BsPersonFill} from "react-icons/bs";
 import IconCard from "../IconCard";
 
@@ -14,6 +14,7 @@ import {useListSearch} from "@/hooks/useListSearch";
 import axios from "axios";
 import {toast} from "react-toastify";
 import Button from "@/components/Low/Button";
+import {getUserName} from "@/utils/users";
 
 interface GroupedCorporateUsers {
 	// list of user Ids
@@ -27,7 +28,7 @@ interface Props {
 }
 
 interface TableData {
-	user: string;
+	user: User | undefined;
 	email: string;
 	correct: number;
 	corporate: string;
@@ -42,10 +43,13 @@ interface UserCount {
 	maxUserCount: number;
 }
 
-const searchFilters = [["email"], ["user"], ["userId"]];
+const searchFilters = [["email"], ["user"], ["userId"], ["exams"], ["assignment"]];
+
+const SIZE = 16;
 
 const MasterStatistical = (props: Props) => {
 	const {users, corporateUsers, displaySelection = true} = props;
+	const [page, setPage] = useState(0);
 
 	// const corporateRelevantUsers = React.useMemo(
 	//   () => corporateUsers.filter((x) => x.type !== "student") as CorporateUser[],
@@ -58,8 +62,7 @@ const MasterStatistical = (props: Props) => {
 	const [startDate, setStartDate] = React.useState<Date | null>(moment("01/01/2023").toDate());
 	const [endDate, setEndDate] = React.useState<Date | null>(moment().endOf("year").toDate());
 
-	const {assignments} = useAssignmentsCorporates({
+	const {assignments, isLoading} = useAssignmentsCorporates({
-		// corporates: [...corporates, "tYU0HTiJdjMsS8SB7XJsUdMMP892"],
 		corporates: selectedCorporates,
 		startDate,
 		endDate,
@@ -73,12 +76,15 @@ const MasterStatistical = (props: Props) => {
 				const userResults = a.assignees.map((assignee) => {
 					const userStats = a.results.find((r) => r.user === assignee)?.stats || [];
 					const userData = users.find((u) => u.id === assignee);
-					const corporate = users.find((u) => u.id === a.assigner)?.name || "";
+					if (!!userData) console.log(assignee, userData.name);
+
+					const corporate = getUserName(users.find((u) => u.id === a.assigner));
 					const commonData = {
-						user: userData?.name || "",
+						user: userData,
-						email: userData?.email || "",
+						email: userData?.email || "N/A",
 						userId: assignee,
 						corporateId: a.corporateId,
+						exams: a.exams.map((x) => x.id).join(", "),
 						corporate,
 						assignment: a.name,
 					};
@@ -87,7 +93,7 @@ const MasterStatistical = (props: Props) => {
 							...commonData,
 							correct: 0,
 							submitted: false,
-							// date: moment(),
+							date: null,
 						};
 					}
 
@@ -104,6 +110,8 @@ 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);
 
@@ -145,7 +153,7 @@ const MasterStatistical = (props: Props) => {
 			header: "User",
 			id: "user",
 			cell: (info) => {
-				return <span>{info.getValue()}</span>;
+				return <span>{info.getValue()?.name || "N/A"}</span>;
 			},
 		}),
 		columnHelper.accessor("email", {
@@ -155,6 +163,13 @@ const MasterStatistical = (props: Props) => {
 				return <span>{info.getValue()}</span>;
 			},
 		}),
+		columnHelper.accessor("user", {
+			header: "Student ID",
+			id: "studentID",
+			cell: (info) => {
+				return <span>{(info.getValue() as StudentUser).studentID || "N/A"}</span>;
+			},
+		}),
 		...(displaySelection
 			? [
 					columnHelper.accessor("corporate", {
@@ -166,13 +181,6 @@ const MasterStatistical = (props: Props) => {
 					}),
 			  ]
 			: []),
-		columnHelper.accessor("corporate", {
-			header: "Corporate",
-			id: "corporate",
-			cell: (info) => {
-				return <span>{info.getValue()}</span>;
-			},
-		}),
 		columnHelper.accessor("assignment", {
 			header: "Assignment",
 			id: "assignment",
@@ -192,7 +200,7 @@ const MasterStatistical = (props: Props) => {
 			},
 		}),
 		columnHelper.accessor("correct", {
-			header: "Correct",
+			header: "Score",
 			id: "correct",
 			cell: (info) => {
 				return <span>{info.getValue()}</span>;
@@ -204,7 +212,7 @@ const MasterStatistical = (props: Props) => {
 			cell: (info) => {
 				const date = info.getValue();
 				if (date) {
-					return <span>{date.format("DD/MM/YYYY")}</span>;
+					return <span>{!!date ? date.format("DD/MM/YYYY") : "N/A"}</span>;
 				}
 
 				return <span>{""}</span>;
@@ -214,8 +222,14 @@ const MasterStatistical = (props: Props) => {
 
 	const {rows: filteredRows, renderSearch, text: searchText} = useListSearch(searchFilters, tableResults);
 
+	useEffect(() => setPage(0), [searchText]);
+	const rows = useMemo(
+		() => filteredRows.slice(page * SIZE, (page + 1) * SIZE > filteredRows.length ? filteredRows.length : (page + 1) * SIZE),
+		[filteredRows, page],
+	);
+
 	const table = useReactTable({
-		data: filteredRows,
+		data: rows,
 		columns: defaultColumns,
 		getCoreRowModel: getCoreRowModel(),
 	});
@@ -276,6 +290,7 @@ const MasterStatistical = (props: Props) => {
 					<IconCard
 						Icon={BsBank}
 						label="Consolidate"
+						isLoading={isLoading}
 						value={getConsolidateScoreStr(consolidateScore)}
 						color="purple"
 						onClick={() => {
@@ -297,6 +312,7 @@ const MasterStatistical = (props: Props) => {
 							<IconCard
 								key={corporateName}
 								Icon={BsBank}
+								isLoading={isLoading}
 								label={corporateName}
 								value={value}
 								color="purple"
@@ -338,13 +354,28 @@ const MasterStatistical = (props: Props) => {
 				</div>
 				{renderSearch()}
 				<div className="flex flex-col gap-3 justify-end">
-					<Button className="max-w-[200px] h-[70px]" variant="outline" onClick={triggerDownload}>
+					<Button className="w-[200px] h-[70px]" variant="outline" isLoading={downloading} onClick={triggerDownload}>
 						Download
 					</Button>
 				</div>
 			</div>
 
-			<div>
+			<div className="w-full h-full flex flex-col gap-4">
+				<div className="w-full flex gap-2 justify-between">
+					<Button className="w-full max-w-[200px]" disabled={page === 0} onClick={() => setPage((prev) => prev - 1)}>
+						Previous Page
+					</Button>
+					<div className="flex items-center gap-4 w-fit">
+						<span className="opacity-80">
+							{page * SIZE + 1} - {(page + 1) * SIZE > filteredRows.length ? filteredRows.length : (page + 1) * SIZE} /{" "}
+							{filteredRows.length}
+						</span>
+						<Button className="w-[200px]" disabled={(page + 1) * SIZE >= filteredRows.length} onClick={() => setPage((prev) => prev + 1)}>
+							Next Page
+						</Button>
+					</div>
+				</div>
+
 				<table className="rounded-xl h-full bg-mti-purple-ultralight/40 w-full">
 					<thead>
 						{table.getHeaderGroups().map((headerGroup) => (

src/dashboards/MasterCorporate/index.tsx

@@ -83,18 +83,6 @@ export default function MasterCorporateDashboard({user}: Props) {
 	const {assignments, isLoading: isAssignmentsLoading, reload: reloadAssignments} = useAssignments({corporate: user.id});
 
 	const assignmentsGroups = useMemo(() => groups.filter((x) => x.admin === user.id || x.participants.includes(user.id)), [groups, user.id]);
-	const assignmentsUsers = useMemo(
-		() =>
-			[...students, ...teachers].filter((x) =>
-				!!selectedUser
-					? groups
-							.filter((g) => g.admin === selectedUser.id)
-							.flatMap((g) => g.participants)
-							.includes(x.id) || false
-					: groups.flatMap((g) => g.participants).includes(x.id),
-			),
-		[groups, selectedUser, teachers, students],
-	);
 
 	const appendUserFilters = useFilterStore((state) => state.appendUserFilter);
 	const router = useRouter();
@@ -131,7 +119,6 @@ export default function MasterCorporateDashboard({user}: Props) {
 
 	const {users} = useUsers();
 
-
 	const groupedByNameCorporates = useMemo(
 		() =>
 			groupBy(
@@ -374,12 +361,18 @@ export default function MasterCorporateDashboard({user}: Props) {
 						color="purple"
 						onClick={() => router.push("/#corporate")}
 					/>
-					<IconCard Icon={BsBank} label="Corporate" value={groupedByNameCorporatesKeys.length} isLoading={isCorporatesLoading} color="purple" />
+					<IconCard
+						Icon={BsBank}
+						label="Corporate"
+						value={groupedByNameCorporatesKeys.length}
+						isLoading={isCorporatesLoading}
+						color="purple"
+					/>
 					<IconCard
 						Icon={BsPersonFillGear}
 						isLoading={isStudentsLoading}
 						label="Student Performance"
-						value={students.length}
+						value={totalStudents}
 						color="purple"
 						onClick={() => router.push("/#studentsPerformance")}
 					/>

src/exams/Selection.tsx

@@ -12,7 +12,7 @@ import {calculateAverageLevel} from "@/utils/score";
 import {sortByModuleName} from "@/utils/moduleUtils";
 import {capitalize} from "lodash";
 import ProfileSummary from "@/components/ProfileSummary";
-import {Variant} from "@/interfaces/exam";
+import {ShuffleMap, Shuffles, Variant} from "@/interfaces/exam";
 import useSessions, {Session} from "@/hooks/useSessions";
 import SessionCard from "@/components/Medium/SessionCard";
 import useExamStore from "@/stores/examStore";
@@ -41,6 +41,7 @@ export default function Selection({user, page, onStart, disableSelection = false
 	};
 
 	const loadSession = async (session: Session) => {
+		state.setShuffles(session.userSolutions.map((x) => ({exerciseID: x.exercise, shuffles: x.shuffleMaps ? x.shuffleMaps : []})));
 		state.setSelectedModules(session.selectedModules);
 		state.setExam(session.exam);
 		state.setExams(session.exams);

src/pages/(admin)/Lists/UserList.tsx

@@ -642,12 +642,12 @@ export default function UserList({
 						</Button>
 						<div className="flex items-center gap-4 w-fit">
 							<span className="opacity-80">
-								{page * 16 + 1} - {(page + 1) * 16 > total ? total : (page + 1) * 16} / {total}
+								{page * userHash.size + 1} - {(page + 1) * userHash.size > total ? total : (page + 1) * userHash.size} / {total}
 							</span>
 							<Button
 								isLoading={isLoading}
 								className="w-[200px]"
-								disabled={page * 16 >= total}
+								disabled={(page + 1) * userHash.size >= total}
 								onClick={() => setPage((prev) => prev + 1)}>
 								Next Page
 							</Button>

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

@@ -11,7 +11,7 @@ import { checkAccess } from "@/utils/permissions";
 import {getAssignmentsForCorporates} from "@/utils/assignments.be";
 import {search} from "@/utils/search";
 import {getGradingSystem} from "@/utils/grading.be";
-import { User } from "@/interfaces/user";
+import {StudentUser, User} from "@/interfaces/user";
 import {calculateBandScore, getGradingLabel} from "@/utils/score";
 import {Module} from "@/interfaces";
 
@@ -19,6 +19,7 @@ export default withIronSessionApiRoute(handler, sessionOptions);
 
 interface TableData {
 	user: string;
+	studentID: string;
 	email: string;
 	correct: number;
 	corporate: string;
@@ -45,9 +46,7 @@ const searchFilters = [["email"], ["user"], ["userId"]];
 async function post(req: NextApiRequest, res: NextApiResponse) {
 	// verify if it's a logged user that is trying to export
 	if (req.session.user) {
-    if (
+		if (!checkAccess(req.session.user, ["mastercorporate", "corporate", "developer", "admin"])) {
-      !checkAccess(req.session.user, ["mastercorporate", "corporate", "developer", "admin"])
-    ) {
 			return res.status(403).json({error: "Unauthorized"});
 		}
 		const {
@@ -65,15 +64,9 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
 		};
 		const startDateParsed = startDate ? new Date(startDate) : undefined;
 		const endDateParsed = endDate ? new Date(endDate) : undefined;
-    const assignments = await getAssignmentsForCorporates(
+		const assignments = await getAssignmentsForCorporates(ids, startDateParsed, endDateParsed);
-      ids,
-      startDateParsed,
-      endDateParsed
-    );
 
-    const assignmentUsers = [
+		const assignmentUsers = [...new Set(assignments.flatMap((a) => a.assignees))];
-      ...new Set(assignments.flatMap((a) => a.assignees)),
-    ];
 		const assigners = [...new Set(assignments.map((a) => a.assigner))];
 		const users = await getSpecificUsers(assignmentUsers);
 		const assignerUsers = await getSpecificUsers(assigners);
@@ -83,7 +76,7 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
 				const data = await getGradingSystem(user);
 				// in this context I need to override as I'll have to match to the assigner
 				return {...data, user: user.id};
-      })
+			}),
 		);
 
 		const getGradingSystemHelper = (
@@ -91,19 +84,12 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
 			assigner: string,
 			user: User,
 			correct: number,
-      total: number
+			total: number,
 		) => {
 			if (exams.some((e) => e.module === "level")) {
-        const gradingSystem = assignerUsersGradingSystems.find(
+				const gradingSystem = assignerUsersGradingSystems.find((gs) => gs.user === assigner);
-          (gs) => gs.user === assigner
-        );
 				if (gradingSystem) {
-          const bandScore = calculateBandScore(
+					const bandScore = calculateBandScore(correct, total, "level", user?.focus || "academic");
-            correct,
-            total,
-            "level",
-            user.focus
-          );
 					return {
 						label: getGradingLabel(bandScore, gradingSystem?.steps || []),
 						score: bandScore,
@@ -117,24 +103,17 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
 		const tableResults = assignments
 			.reduce((accmA: TableData[], a: AssignmentWithCorporateId) => {
 				const userResults = a.assignees.map((assignee) => {
-          const userStats =
+					const userStats = a.results.find((r) => r.user === assignee)?.stats || [];
-            a.results.find((r) => r.user === assignee)?.stats || [];
 					const userData = users.find((u) => u.id === assignee);
 					const corporateUser = users.find((u) => u.id === a.assigner);
 					const correct = userStats.reduce((n, e) => n + e.score.correct, 0);
 					const total = userStats.reduce((n, e) => n + e.score.total, 0);
-          const { label: level, score } = getGradingSystemHelper(
+					const {label: level, score} = getGradingSystemHelper(a.exams, a.assigner, userData!, correct, total);
-            a.exams,
-            a.assigner,
-            userData!,
-            correct,
-            total
-          );
 
-          console.log("Level", level);
 					const commonData = {
 						user: userData?.name || "",
 						email: userData?.email || "",
+						studentID: (userData as StudentUser).studentID || "",
 						userId: assignee,
 						corporateId: a.corporateId,
 						corporate: corporateUser?.name || "",
@@ -186,6 +165,10 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
 				label: "Email",
 				value: (entry: TableData) => entry.email,
 			},
+			{
+				label: "Student ID",
+				value: (entry: TableData) => entry.studentID,
+			},
 			...(displaySelection
 				? [
 						{
@@ -223,9 +206,7 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
 			})),
 		];
 
-    const filteredSearch = searchText
+		const filteredSearch = searchText ? search(searchText, searchFilters, tableResults) : tableResults;
-      ? search(searchText, searchFilters, tableResults)
-      : tableResults;
 
 		worksheet.addRow(headers.map((h) => h.label));
 		(filteredSearch as TableData[]).forEach((entry) => {
@@ -241,8 +222,7 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
 		const fileRef = ref(storage, refName);
 		// upload the pdf to storage
 		await uploadBytes(fileRef, buffer, {
-      contentType:
+			contentType: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
 		});
 
 		const url = await getDownloadURL(fileRef);

src/pages/api/groups/[id].ts

@@ -50,11 +50,7 @@ async function del(req: NextApiRequest, res: NextApiResponse) {
 	}
 
 	const user = req.session.user;
-  if (
+	if (user.type === "admin" || user.type === "developer" || user.id === group.admin) {
-    user.type === "admin" ||
-    user.type === "developer" ||
-    user.id === group.admin
-  ) {
 		await db.collection("groups").deleteOne({id: id});
 
 		res.status(200).json({ok: true});
@@ -79,27 +75,13 @@ async function patch(req: NextApiRequest, res: NextApiResponse) {
 	}
 
 	const user = req.session.user;
-  if (
+	if (user.type === "admin" || user.type === "developer" || user.id === group.admin) {
-    user.type === "admin" ||
-    user.type === "developer" ||
-    user.id === group.admin
-  ) {
 		if ("participants" in req.body) {
-      const newParticipants = (req.body.participants as string[]).filter(
+			const newParticipants = (req.body.participants as string[]).filter((x) => !group.participants.includes(x));
-        (x) => !group.participants.includes(x),
+			await Promise.all(newParticipants.map(async (p) => await updateExpiryDateOnGroup(p, group.admin)));
-      );
-      await Promise.all(
-        newParticipants.map(
-          async (p) => await updateExpiryDateOnGroup(p, group.admin),
-        ),
-      );
 		}
 
-    await db.collection("grading").updateOne(
+		await db.collection("groups").updateOne({id: req.session.user.id}, {$set: {id, ...req.body}}, {upsert: true});
-      { id: req.session.user.id },
-      { $set: {id: id, ...req.body} },
-      { upsert: true }
-    );
 
 		res.status(200).json({ok: true});
 		return;

src/utils/assignments.be.ts

@@ -26,7 +26,14 @@ export const getAssignmentsByAssignerBetweenDates = async (id: string, startDate
 };
 
 export const getAssignmentsByAssigners = async (ids: string[], startDate?: Date, endDate?: Date) => {
-	return (await Promise.all(ids.map((id) => getAssignmentsByAssigner(id, startDate, endDate)))).flat();
+	return await db
+		.collection("assignments")
+		.find<Assignment>({
+			assigner: {$in: ids},
+			...(!!startDate ? {startDate: {$gte: startDate.toISOString()}} : {}),
+			...(!!endDate ? {endDate: {$lte: endDate.toISOString()}} : {}),
+		})
+		.toArray();
 };
 
 export const getAssignmentsForCorporates = async (idsList: string[], startDate?: Date, endDate?: Date) => {
@@ -57,4 +64,4 @@ export const getAssignmentsForCorporates = async (idsList: string[], startDate?:
 	);
 
 	return assignments.flat();
-}
+};

src/utils/groups.be.ts

@@ -1,8 +1,9 @@
 import {app} from "@/firebase";
+import {Assignment} from "@/interfaces/results";
 import {CorporateUser, Group, MasterCorporateUser, StudentUser, TeacherUser, User} from "@/interfaces/user";
 import client from "@/lib/mongodb";
 import moment from "moment";
-import {getUser} from "./users.be";
+import {getLinkedUsers, getUser} from "./users.be";
 import {getSpecificUsers} from "./users.be";
 
 const db = client.db(process.env.MONGODB_DB);
@@ -71,17 +72,10 @@ export const getUsersGroups = async (ids: string[]) => {
 };
 
 export const getAllAssignersByCorporate = async (corporateID: string): Promise<string[]> => {
-	const groups = await getUserGroups(corporateID);
+	const linkedTeachers = await getLinkedUsers(corporateID, "mastercorporate", "teacher");
-	const groupUsers = (await Promise.all(groups.map(async (g) => await Promise.all(g.participants.map(getUser)))))
+	const linkedCorporates = await getLinkedUsers(corporateID, "mastercorporate", "corporate");
-		.flat()
-		.filter((x) => !!x) as User[];
-	const teacherPromises = await Promise.all(
-		groupUsers.map(async (u) =>
-			u.type === "teacher" ? u.id : u.type === "corporate" ? [...(await getAllAssignersByCorporate(u.id)), u.id] : undefined,
-		),
-	);
 
-	return teacherPromises.filter((x) => !!x).flat() as string[];
+	return [...linkedTeachers.users.map((x) => x.id), ...linkedCorporates.users.map((x) => x.id)];
 };
 
 export const getGroupsForUser = async (admin?: string, participant?: string) => {