Removed sorting in exchange for filtering

Feature/training content

Approved-by: Tiago Ribeiro

src/components/DemographicInformationInput.tsx

@@ -17,7 +17,7 @@ import moment from "moment";
 
 interface Props {
 	user: User;
-	mutateUser: KeyedMutator<User>;
+	mutateUser: (user: User) => void;
 }
 
 export default function DemographicInformationInput({user, mutateUser}: Props) {

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

@@ -31,12 +31,40 @@ interface Props {
 	user: User;
 }
 
+const studentHash = {
+	type: "student",
+	size: 25,
+	orderBy: "registrationDate",
+};
+
+const teacherHash = {
+	type: "teacher",
+	size: 25,
+	orderBy: "registrationDate",
+};
+
+const corporateHash = {
+	type: "corporate",
+	size: 25,
+	orderBy: "registrationDate",
+};
+
+const agentsHash = {
+	type: "agent",
+	size: 25,
+	orderBy: "registrationDate",
+};
+
 export default function AdminDashboard({user}: Props) {
 	const [page, setPage] = useState("");
 	const [selectedUser, setSelectedUser] = useState<User>();
 	const [showModal, setShowModal] = useState(false);
 
-	const {users, reload, isLoading} = useUsers();
+	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(agentsHash);
+
 	const {groups} = useGroups({});
 	const {pending, done} = usePaymentStatusUsers();
 
@@ -47,9 +75,6 @@ export default function AdminDashboard({user}: Props) {
 		setShowModal(!!selectedUser && router.asPath === "/#");
 	}, [selectedUser, router.asPath]);
 
-	// eslint-disable-next-line react-hooks/exhaustive-deps
-	useEffect(reload, [page]);
-
 	const inactiveCountryManagerFilter = (x: User) => x.status === "disabled" || moment().isAfter(x.subscriptionExpirationDate);
 
 	const UserDisplay = (displayUser: User) => (
@@ -279,50 +304,50 @@ export default function AdminDashboard({user}: Props) {
 			<section className="w-full grid grid-cols-2 md:grid-cols-3 lg:grid-cols-4 gap-4 place-items-center items-center justify-between">
 				<IconCard
 					Icon={BsPersonFill}
-					isLoading={isLoading}
+					isLoading={isStudentsLoading}
 					label="Students"
-					value={users.filter((x) => x.type === "student").length}
+					value={totalStudents}
 					onClick={() => router.push("/#students")}
 					color="purple"
 				/>
 				<IconCard
 					Icon={BsPencilSquare}
-					isLoading={isLoading}
+					isLoading={isTeachersLoading}
 					label="Teachers"
-					value={users.filter((x) => x.type === "teacher").length}
+					value={totalTeachers}
 					onClick={() => router.push("/#teachers")}
 					color="purple"
 				/>
 				<IconCard
 					Icon={BsBank}
-					isLoading={isLoading}
+					isLoading={isCorporatesLoading}
 					label="Corporate"
-					value={users.filter((x) => x.type === "corporate").length}
+					value={totalCorporate}
 					onClick={() => router.push("/#corporate")}
 					color="purple"
 				/>
 				<IconCard
 					Icon={BsBriefcaseFill}
-					isLoading={isLoading}
+					isLoading={isAgentsLoading}
 					label="Country Managers"
-					value={users.filter((x) => x.type === "agent").length}
+					value={totalAgents}
 					onClick={() => router.push("/#agents")}
 					color="purple"
 				/>
 				<IconCard
 					Icon={BsGlobeCentralSouthAsia}
-					isLoading={isLoading}
+					isLoading={isAgentsLoading}
 					label="Countries"
-					value={[...new Set(users.filter((x) => x.demographicInformation).map((x) => x.demographicInformation?.country))].length}
+					value={[...new Set(agents.filter((x) => x.demographicInformation).map((x) => x.demographicInformation?.country))].length}
 					color="purple"
 				/>
 				<IconCard
 					onClick={() => router.push("/#inactiveStudents")}
 					Icon={BsPersonFill}
-					isLoading={isLoading}
+					isLoading={isStudentsLoading}
 					label="Inactive Students"
 					value={
-						users.filter((x) => x.type === "student" && (x.status === "disabled" || moment().isAfter(x.subscriptionExpirationDate)))
+						students.filter((x) => x.type === "student" && (x.status === "disabled" || moment().isAfter(x.subscriptionExpirationDate)))
 							.length
 					}
 					color="rose"
@@ -330,26 +355,26 @@ export default function AdminDashboard({user}: Props) {
 				<IconCard
 					onClick={() => router.push("/#inactiveCountryManagers")}
 					Icon={BsBriefcaseFill}
-					isLoading={isLoading}
+					isLoading={isAgentsLoading}
 					label="Inactive Country Managers"
-					value={users.filter(inactiveCountryManagerFilter).length}
+					value={agents.filter(inactiveCountryManagerFilter).length}
 					color="rose"
 				/>
 				<IconCard
 					onClick={() => router.push("/#inactiveCorporate")}
 					Icon={BsBank}
-					isLoading={isLoading}
+					isLoading={isCorporatesLoading}
 					label="Inactive Corporate"
 					value={
-						users.filter((x) => x.type === "corporate" && (x.status === "disabled" || moment().isAfter(x.subscriptionExpirationDate)))
-							.length
+						corporates.filter(
+							(x) => x.type === "corporate" && (x.status === "disabled" || moment().isAfter(x.subscriptionExpirationDate)),
+						).length
 					}
 					color="rose"
 				/>
 				<IconCard
 					onClick={() => router.push("/#paymentdone")}
 					Icon={BsCurrencyDollar}
-					isLoading={isLoading}
 					label="Payment Done"
 					value={done.length}
 					color="purple"
@@ -357,7 +382,6 @@ export default function AdminDashboard({user}: Props) {
 				<IconCard
 					onClick={() => router.push("/#paymentpending")}
 					Icon={BsCurrencyDollar}
-					isLoading={isLoading}
 					label="Pending Payment"
 					value={pending.length}
 					color="rose"
@@ -365,14 +389,13 @@ export default function AdminDashboard({user}: Props) {
 				<IconCard
 					onClick={() => router.push("https://cms.encoach.com/admin")}
 					Icon={BsLayoutSidebar}
-					isLoading={isLoading}
 					label="Content Management System (CMS)"
 					color="green"
 				/>
 				<IconCard
 					onClick={() => router.push("/#corporatestudentslevels")}
 					Icon={BsPersonFill}
-					isLoading={isLoading}
+					isLoading={isStudentsLoading}
 					label="Corporate Students Levels"
 					color="purple"
 				/>
@@ -382,8 +405,7 @@ export default function AdminDashboard({user}: Props) {
 				<div className="bg-white shadow flex flex-col rounded-xl w-full">
 					<span className="p-4">Latest students</span>
 					<div className="flex flex-col items-start h-96 overflow-scroll scrollbar-hide">
-						{users
-							.filter((x) => x.type === "student")
+						{students
 							.sort((a, b) => dateSorter(a, b, "desc", "registrationDate"))
 							.map((x) => (
 								<UserDisplay key={x.id} {...x} />
@@ -393,8 +415,7 @@ export default function AdminDashboard({user}: Props) {
 				<div className="bg-white shadow flex flex-col rounded-xl w-full">
 					<span className="p-4">Latest teachers</span>
 					<div className="flex flex-col items-start h-96 overflow-scroll scrollbar-hide">
-						{users
-							.filter((x) => x.type === "teacher")
+						{teachers
 							.sort((a, b) => {
 								return dateSorter(a, b, "desc", "registrationDate");
 							})
@@ -406,8 +427,7 @@ export default function AdminDashboard({user}: Props) {
 				<div className="bg-white shadow flex flex-col rounded-xl w-full">
 					<span className="p-4">Latest corporate</span>
 					<div className="flex flex-col items-start h-96 overflow-scroll scrollbar-hide">
-						{users
-							.filter((x) => x.type === "corporate")
+						{corporates
 							.sort((a, b) => {
 								return dateSorter(a, b, "desc", "registrationDate");
 							})
@@ -419,8 +439,8 @@ export default function AdminDashboard({user}: Props) {
 				<div className="bg-white shadow flex flex-col rounded-xl w-full">
 					<span className="p-4">Unpaid Corporate</span>
 					<div className="flex flex-col items-start h-96 overflow-scroll scrollbar-hide">
-						{users
-							.filter((x) => x.type === "corporate" && x.status === "paymentDue")
+						{corporates
+							.filter((x) => x.status === "paymentDue")
 							.map((x) => (
 								<UserDisplay key={x.id} {...x} />
 							))}
@@ -429,10 +449,9 @@ export default function AdminDashboard({user}: Props) {
 				<div className="bg-white shadow flex flex-col rounded-xl w-full">
 					<span className="p-4">Students expiring in 1 month</span>
 					<div className="flex flex-col items-start h-96 overflow-scroll scrollbar-hide">
-						{users
+						{students
 							.filter(
 								(x) =>
-									x.type === "student" &&
 									x.subscriptionExpirationDate &&
 									moment().isAfter(moment(x.subscriptionExpirationDate).subtract(30, "days")) &&
 									moment().isBefore(moment(x.subscriptionExpirationDate)),
@@ -445,10 +464,9 @@ export default function AdminDashboard({user}: Props) {
 				<div className="bg-white shadow flex flex-col rounded-xl w-full">
 					<span className="p-4">Teachers expiring in 1 month</span>
 					<div className="flex flex-col items-start h-96 overflow-scroll scrollbar-hide">
-						{users
+						{teachers
 							.filter(
 								(x) =>
-									x.type === "teacher" &&
 									x.subscriptionExpirationDate &&
 									moment().isAfter(moment(x.subscriptionExpirationDate).subtract(30, "days")) &&
 									moment().isBefore(moment(x.subscriptionExpirationDate)),
@@ -461,10 +479,9 @@ export default function AdminDashboard({user}: Props) {
 				<div className="bg-white shadow flex flex-col rounded-xl w-full">
 					<span className="p-4">Country Manager expiring in 1 month</span>
 					<div className="flex flex-col items-start h-96 overflow-scroll scrollbar-hide">
-						{users
+						{agents
 							.filter(
 								(x) =>
-									x.type === "agent" &&
 									x.subscriptionExpirationDate &&
 									moment().isAfter(moment(x.subscriptionExpirationDate).subtract(30, "days")) &&
 									moment().isBefore(moment(x.subscriptionExpirationDate)),
@@ -477,10 +494,9 @@ export default function AdminDashboard({user}: Props) {
 				<div className="bg-white shadow flex flex-col rounded-xl w-full">
 					<span className="p-4">Corporate expiring in 1 month</span>
 					<div className="flex flex-col items-start h-96 overflow-scroll scrollbar-hide">
-						{users
+						{corporates
 							.filter(
 								(x) =>
-									x.type === "corporate" &&
 									x.subscriptionExpirationDate &&
 									moment().isAfter(moment(x.subscriptionExpirationDate).subtract(30, "days")) &&
 									moment().isBefore(moment(x.subscriptionExpirationDate)),
@@ -493,10 +509,8 @@ export default function AdminDashboard({user}: Props) {
 				<div className="bg-white shadow flex flex-col rounded-xl w-full">
 					<span className="p-4">Expired Students</span>
 					<div className="flex flex-col items-start h-96 overflow-scroll scrollbar-hide">
-						{users
-							.filter(
-								(x) => x.type === "student" && x.subscriptionExpirationDate && moment().isAfter(moment(x.subscriptionExpirationDate)),
-							)
+						{students
+							.filter((x) => x.subscriptionExpirationDate && moment().isAfter(moment(x.subscriptionExpirationDate)))
 							.map((x) => (
 								<UserDisplay key={x.id} {...x} />
 							))}
@@ -505,10 +519,8 @@ export default function AdminDashboard({user}: Props) {
 				<div className="bg-white shadow flex flex-col rounded-xl w-full">
 					<span className="p-4">Expired Teachers</span>
 					<div className="flex flex-col items-start h-96 overflow-scroll scrollbar-hide">
-						{users
-							.filter(
-								(x) => x.type === "teacher" && x.subscriptionExpirationDate && moment().isAfter(moment(x.subscriptionExpirationDate)),
-							)
+						{teachers
+							.filter((x) => x.subscriptionExpirationDate && moment().isAfter(moment(x.subscriptionExpirationDate)))
 							.map((x) => (
 								<UserDisplay key={x.id} {...x} />
 							))}
@@ -517,10 +529,8 @@ export default function AdminDashboard({user}: Props) {
 				<div className="bg-white shadow flex flex-col rounded-xl w-full">
 					<span className="p-4">Expired Country Manager</span>
 					<div className="flex flex-col items-start h-96 overflow-scroll scrollbar-hide">
-						{users
-							.filter(
-								(x) => x.type === "agent" && x.subscriptionExpirationDate && moment().isAfter(moment(x.subscriptionExpirationDate)),
-							)
+						{agents
+							.filter((x) => x.subscriptionExpirationDate && moment().isAfter(moment(x.subscriptionExpirationDate)))
 							.map((x) => (
 								<UserDisplay key={x.id} {...x} />
 							))}
@@ -529,11 +539,8 @@ export default function AdminDashboard({user}: Props) {
 				<div className="bg-white shadow flex flex-col rounded-xl w-full">
 					<span className="p-4">Expired Corporate</span>
 					<div className="flex flex-col items-start h-96 overflow-scroll scrollbar-hide">
-						{users
-							.filter(
-								(x) =>
-									x.type === "corporate" && x.subscriptionExpirationDate && moment().isAfter(moment(x.subscriptionExpirationDate)),
-							)
+						{corporates
+							.filter((x) => x.subscriptionExpirationDate && moment().isAfter(moment(x.subscriptionExpirationDate)))
 							.map((x) => (
 								<UserDisplay key={x.id} {...x} />
 							))}
@@ -553,7 +560,10 @@ export default function AdminDashboard({user}: Props) {
 								loggedInUser={user}
 								onClose={(shouldReload) => {
 									setSelectedUser(undefined);
-									if (shouldReload) reload();
+									if (shouldReload && selectedUser!.type === "student") reloadStudents();
+									if (shouldReload && selectedUser!.type === "teacher") reloadTeachers();
+									if (shouldReload && selectedUser!.type === "corporate") reloadCorporates();
+									if (shouldReload && selectedUser!.type === "agent") reloadAgents();
 								}}
 								onViewStudents={
 									selectedUser.type === "corporate" || selectedUser.type === "teacher"

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/Corporate/index.tsx

@@ -1,18 +1,8 @@
 /* eslint-disable @next/next/no-img-element */
 import Modal from "@/components/Modal";
 import useFilterRecordsByUser from "@/hooks/useFilterRecordsByUser";
-import useUsers, {
-  userHashStudent,
-  userHashTeacher,
-  userHashCorporate,
-} from "@/hooks/useUsers";
-import {
-  CorporateUser,
-  Group,
-  MasterCorporateUser,
-  Stat,
-  User,
-} from "@/interfaces/user";
+import useUsers, {userHashStudent, 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 moment from "moment";
@@ -40,11 +30,7 @@ import {
 } from "react-icons/bs";
 import UserCard from "@/components/UserCard";
 import useGroups from "@/hooks/useGroups";
-import {
-  averageLevelCalculator,
-  calculateAverageLevel,
-  calculateBandScore,
-} from "@/utils/score";
+import {averageLevelCalculator, calculateAverageLevel, calculateBandScore} from "@/utils/score";
 import {MODULE_ARRAY} from "@/utils/moduleUtils";
 import {Module} from "@/interfaces";
 import {groupByExam} from "@/utils/stats";
@@ -64,16 +50,12 @@ import { createColumnHelper } from "@tanstack/react-table";
 import Checkbox from "@/components/Low/Checkbox";
 import List from "@/components/List";
 import {getUserCompanyName} from "@/resources/user";
-import {
-  futureAssignmentFilter,
-  pastAssignmentFilter,
-  archivedAssignmentFilter,
-  activeAssignmentFilter,
-} from "@/utils/assignments";
+import {futureAssignmentFilter, pastAssignmentFilter, archivedAssignmentFilter, activeAssignmentFilter} from "@/utils/assignments";
 import useUserBalance from "@/hooks/useUserBalance";
 import AssignmentsPage from "../views/AssignmentsPage";
 import StudentPerformancePage from "./StudentPerformancePage";
 import MasterStatistical from "../MasterCorporate/MasterStatistical";
+import MasterStatisticalPage from "./MasterStatisticalPage";
 
 interface Props {
 	user: CorporateUser;
@@ -98,36 +80,16 @@ export default function CorporateDashboard({ user, linkedCorporate }: Props) {
 
 	const {data: stats} = useFilterRecordsByUser<Stat[]>();
 	const {groups} = useGroups({admin: user.id});
-  const {
-    assignments,
-    isLoading: isAssignmentsLoading,
-    reload: reloadAssignments,
-  } = useAssignments({ corporate: user.id });
+	const {assignments, isLoading: isAssignmentsLoading, reload: reloadAssignments} = useAssignments({corporate: user.id});
 	const {balance} = useUserBalance();
 
-  const {
-    users: students,
-    total: totalStudents,
-    reload: reloadStudents,
-    isLoading: isStudentsLoading,
-  } = useUsers(studentHash);
-  const {
-    users: teachers,
-    total: totalTeachers,
-    reload: reloadTeachers,
-    isLoading: isTeachersLoading,
-  } = useUsers(teacherHash);
+	const {users: students, total: totalStudents, reload: reloadStudents, 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(
-    () =>
-      groups.filter(
-        (x) => x.admin === user.id || x.participants.includes(user.id)
-      ),
-    [groups, user.id]
-  );
+	const assignmentsGroups = useMemo(() => groups.filter((x) => x.admin === user.id || x.participants.includes(user.id)), [groups, user.id]);
 
 	const assignmentsUsers = useMemo(
 		() =>
@@ -137,28 +99,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) =>
-    stats.filter((s) => s.user === user.id);
+	const getStatsByStudent = (user: User) => 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"
-    >
-      <img
-        src={displayUser.profilePicture}
-        alt={displayUser.name}
-        className="rounded-full w-10 h-10"
-      />
+			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" />
 			<div className="flex flex-col gap-1 items-start">
 				<span>{displayUser.name}</span>
 				<span className="text-sm opacity-75">{displayUser.email}</span>
@@ -166,59 +122,19 @@ export default function CorporateDashboard({ user, linkedCorporate }: Props) {
 		</div>
 	);
 
-  // this workaround will allow us toreuse the master statistical due to master corporate restraints
-  // while still being able to use the corporate user
-  const groupedByNameCorporateIds = useMemo(
-    () => ({
-      [user.corporateInformation?.companyInformation?.name || user.name]: [
-        user.id,
-      ],
-    }),
-    [user]
-  );
-  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"
-          >
-            <BsArrowLeft className="text-xl" />
-            <span>Back</span>
-          </div>
-          <h2 className="text-2xl font-semibold">Master Statistical</h2>
-        </div>
-        <MasterStatistical
-          users={teachersAndStudents}
-          corporateUsers={groupedByNameCorporateIds}
-          displaySelection={false}
-        />
-      </>
-    );
-  };
-
 	const GroupsList = () => {
-    const filter = (x: Group) =>
-      x.admin === user.id || x.participants.includes(user.id);
+		const filter = (x: Group) => 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">
-            Groups ({groups.filter(filter).length})
-          </h2>
+					<h2 className="text-2xl font-semibold">Groups ({groups.filter(filter).length})</h2>
 				</div>
 
 				<GroupList user={user} />
@@ -236,12 +152,7 @@ export default function CorporateDashboard({ user, linkedCorporate }: Props) {
 			.filter((f) => !!f.focus);
 		const bandScores = formattedStats.map((s) => ({
 			module: s.module,
-      level: calculateBandScore(
-        s.score.correct,
-        s.score.total,
-        s.module,
-        s.focus!
-      ),
+			level: calculateBandScore(s.score.correct, s.score.total, s.module, s.focus!),
 		}));
 
 		const levels: {[key in Module]: number} = {
@@ -265,8 +176,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 +195,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 +206,7 @@ export default function CorporateDashboard({ user, linkedCorporate }: Props) {
 		);
 
 	if (router.asPath === "/#groups") return <GroupsList />;
-  if (router.asPath === "/#studentsPerformance")
-    return <StudentPerformancePage user={user} />;
+	if (router.asPath === "/#studentsPerformance") return <StudentPerformancePage user={user} />;
 
 	if (router.asPath === "/#assignments")
 		return (
@@ -312,7 +220,7 @@ export default function CorporateDashboard({ user, linkedCorporate }: Props) {
 			/>
 		);
 
-  if (router.asPath === "/#statistical") return <MasterStatisticalPage />;
+	if (router.asPath === "/#statistical") return <MasterStatisticalPage user={user} />;
 
 	return (
 		<>
@@ -324,14 +232,11 @@ export default function CorporateDashboard({ user, linkedCorporate }: Props) {
 								loggedInUser={user}
 								onClose={(shouldReload) => {
 									setSelectedUser(undefined);
-                  if (shouldReload && selectedUser!.type === "student")
-                    reloadStudents();
-                  if (shouldReload && selectedUser!.type === "teacher")
-                    reloadTeachers();
+									if (shouldReload && selectedUser!.type === "student") reloadStudents();
+									if (shouldReload && selectedUser!.type === "teacher") reloadTeachers();
 								}}
 								onViewStudents={
-                  selectedUser.type === "corporate" ||
-                  selectedUser.type === "teacher"
+									selectedUser.type === "corporate" || selectedUser.type === "teacher"
 										? () => {
 												appendUserFilters({
 													id: "view-students",
@@ -341,11 +246,7 @@ export default function CorporateDashboard({ user, linkedCorporate }: Props) {
 													id: "belongs-to-admin",
 													filter: (x: User) =>
 														groups
-                              .filter(
-                                (g) =>
-                                  g.admin === selectedUser.id ||
-                                  g.participants.includes(selectedUser.id)
-                              )
+															.filter((g) => g.admin === selectedUser.id || g.participants.includes(selectedUser.id))
 															.flatMap((g) => g.participants)
 															.includes(x.id),
 												});
@@ -355,8 +256,7 @@ export default function CorporateDashboard({ user, linkedCorporate }: Props) {
 										: undefined
 								}
 								onViewTeachers={
-                  selectedUser.type === "corporate" ||
-                  selectedUser.type === "student"
+									selectedUser.type === "corporate" || selectedUser.type === "student"
 										? () => {
 												appendUserFilters({
 													id: "view-teachers",
@@ -366,11 +266,7 @@ export default function CorporateDashboard({ user, linkedCorporate }: Props) {
 													id: "belongs-to-admin",
 													filter: (x: User) =>
 														groups
-                              .filter(
-                                (g) =>
-                                  g.admin === selectedUser.id ||
-                                  g.participants.includes(selectedUser.id)
-                              )
+															.filter((g) => g.admin === selectedUser.id || g.participants.includes(selectedUser.id))
 															.flatMap((g) => g.participants)
 															.includes(x.id),
 												});
@@ -389,11 +285,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:{" "}
-            <b>
-              {linkedCorporate?.corporateInformation?.companyInformation.name ||
-                linkedCorporate.name}
-            </b>
+						Linked to: <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 +308,27 @@ export default function CorporateDashboard({ user, linkedCorporate }: Props) {
 					<IconCard
 						Icon={BsClipboard2Data}
 						label="Exams Performed"
-            value={
-              stats.filter((s) =>
-                groups.flatMap((g) => g.participants).includes(s.user)
-              ).length
-            }
+						value={stats.filter((s) => groups.flatMap((g) => g.participants).includes(s.user)).length}
 						color="purple"
 					/>
 					<IconCard
 						Icon={BsPaperclip}
 						isLoading={isStudentsLoading}
 						label="Average Level"
-            value={averageLevelCalculator(
-              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}
+						value={averageLevelCalculator(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
 						Icon={BsPersonCheck}
 						label="User Balance"
-            value={`${balance}/${
-              user.corporateInformation?.companyInformation?.userAmount || 0
-            }`}
+						value={`${balance}/${user.corporateInformation?.companyInformation?.userAmount || 0}`}
 						color="purple"
 					/>
 					<IconCard
 						Icon={BsClock}
 						label="Expiration Date"
-            value={
-              user.subscriptionExpirationDate
-                ? moment(user.subscriptionExpirationDate).format("DD/MM/yyyy")
-                : "Unlimited"
-            }
+						value={user.subscriptionExpirationDate ? moment(user.subscriptionExpirationDate).format("DD/MM/yyyy") : "Unlimited"}
 						color="rose"
 					/>
 					<IconCard
@@ -467,24 +339,16 @@ export default function CorporateDashboard({ user, linkedCorporate }: Props) {
 						color="purple"
 						onClick={() => router.push("/#studentsPerformance")}
 					/>
-          <IconCard
-            Icon={BsDatabase}
-            label="Master Statistical"
-            color="purple"
-            onClick={() => router.push("/#statistical")}
-          />
+					<IconCard 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
-                  ? "Loading..."
-                  : assignments.filter((a) => !a.archived).length}
+								{isAssignmentsLoading ? "Loading..." : assignments.filter((a) => !a.archived).length}
 							</span>
 						</span>
 					</button>
@@ -515,11 +379,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(
-                  (a, b) =>
-                    calculateAverageLevel(b.levels) -
-                    calculateAverageLevel(a.levels)
-                )
+								.sort((a, b) => calculateAverageLevel(b.levels) - calculateAverageLevel(a.levels))
 								.map((x) => (
 									<UserDisplay key={x.id} {...x} />
 								))}
@@ -531,8 +391,7 @@ export default function CorporateDashboard({ user, linkedCorporate }: Props) {
 							{students
 								.sort(
 									(a, b) =>
-                    Object.keys(groupByExam(getStatsByStudent(b))).length -
-                    Object.keys(groupByExam(getStatsByStudent(a))).length
+										Object.keys(groupByExam(getStatsByStudent(b))).length - Object.keys(groupByExam(getStatsByStudent(a))).length,
 								)
 								.map((x) => (
 									<UserDisplay key={x.id} {...x} />

src/dashboards/MasterCorporate/MasterStatistical.tsx

@@ -1,5 +1,5 @@
-import React from "react";
-import {CorporateUser, User} from "@/interfaces/user";
+import React, {useEffect, useMemo, useState} from "react";
+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({
-		// corporates: [...corporates, "tYU0HTiJdjMsS8SB7XJsUdMMP892"],
+	const {assignments, isLoading} = useAssignmentsCorporates({
 		corporates: selectedCorporates,
 		startDate,
 		endDate,
@@ -71,23 +74,25 @@ const MasterStatistical = (props: Props) => {
 		() =>
 			assignments.reduce((accmA: TableData[], a: AssignmentWithCorporateId) => {
 				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 || "";
+					const userStats = a.results.find((r) => r.user === assignee)?.stats || [];
+					const corporate = getUserName(users.find((u) => u.id === a.assigner));
 					const commonData = {
-						user: userData?.name || "",
-						email: userData?.email || "",
+						user: userData,
+						email: userData?.email || "N/A",
 						userId: assignee,
 						corporateId: a.corporateId,
+						exams: a.exams.map((x) => x.id).join(", "),
 						corporate,
 						assignment: a.name,
 					};
+
 					if (userStats.length === 0) {
 						return {
 							...commonData,
 							correct: 0,
 							submitted: false,
-							// date: moment(),
+							date: null,
 						};
 					}
 
@@ -145,7 +150,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 +160,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 +178,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 +197,7 @@ const MasterStatistical = (props: Props) => {
 			},
 		}),
 		columnHelper.accessor("correct", {
-			header: "Correct",
+			header: "Score",
 			id: "correct",
 			cell: (info) => {
 				return <span>{info.getValue()}</span>;
@@ -204,7 +209,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 +219,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 +287,7 @@ const MasterStatistical = (props: Props) => {
 					<IconCard
 						Icon={BsBank}
 						label="Consolidate"
+						isLoading={isLoading}
 						value={getConsolidateScoreStr(consolidateScore)}
 						color="purple"
 						onClick={() => {
@@ -297,6 +309,7 @@ const MasterStatistical = (props: Props) => {
 							<IconCard
 								key={corporateName}
 								Icon={BsBank}
+								isLoading={isLoading}
 								label={corporateName}
 								value={value}
 								color="purple"
@@ -338,13 +351,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/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/useListSearch.tsx

@@ -8,7 +8,8 @@ export function useListSearch<T>(fields: string[][], rows: T[]) {
 	const renderSearch = () => <Input label="Search" type="text" name="search" onChange={setText} placeholder="Enter search text" value={text} />;
 
 	const updatedRows = useMemo(() => {
-		return search(text, fields, rows);
+		if (text.length > 0) return search(text, fields, rows);
+		return rows;
 	}, [fields, rows, text]);
 
 	return {

src/hooks/usePagination.tsx

@@ -0,0 +1,28 @@
+import Button from "@/components/Low/Button";
+import {useMemo, useState} from "react";
+
+export default function usePagination<T>(list: T[], size = 25) {
+	const [page, setPage] = useState(0);
+
+	const items = useMemo(() => list.slice(page * size, (page + 1) * size), [page, size, list]);
+
+	const render = () => (
+		<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={page === 0} onClick={() => setPage((prev) => prev - 1)}>
+					Previous Page
+				</Button>
+			</div>
+			<div className="flex items-center gap-4 w-fit">
+				<span className="opacity-80">
+					{page * size + 1} - {(page + 1) * size > list.length ? list.length : (page + 1) * size} / {list.length}
+				</span>
+				<Button className="w-[200px]" disabled={(page + 1) * size >= list.length} onClick={() => setPage((prev) => prev + 1)}>
+					Next Page
+				</Button>
+			</div>
+		</div>
+	);
+
+	return {page, items, setPage, render};
+}

src/hooks/useSessions.tsx

@@ -1,12 +1,9 @@
 import {Exam} from "@/interfaces/exam";
 import {ExamState} from "@/stores/examStore";
-import Axios from "axios";
+import axios from "axios";
 import {setupCache} from "axios-cache-interceptor";
 import {useEffect, useState} from "react";
 
-const instance = Axios.create();
-const axios = setupCache(instance);
-
 export type Session = ExamState & {user: string; id: string; date: string};
 
 export default function useSessions(user?: string) {

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/(admin)/BatchCreateUser.tsx

@@ -53,7 +53,7 @@ const USER_TYPE_PERMISSIONS: {
 	},
 	admin: {
 		perm: "createCodeAdmin",
-		list: ["student", "teacher", "agent", "corporate", "admin", "mastercorporate"],
+		list: ["student", "teacher", "agent", "corporate", "mastercorporate"],
 	},
 	developer: {
 		perm: undefined,
@@ -161,7 +161,7 @@ export default function BatchCreateUser({user, users, permissions, onFinish}: Pr
 			setIsLoading(true);
 
 			try {
-				await axios.post("/api/batch_users", { users: newUsers.map(user => ({...user, type, expiryDate})) });
+				await axios.post("/api/batch_users", {users: newUsers.map((user) => ({...user, type, expiryDate}))});
 				toast.success(`Successfully added ${newUsers.length} user(s)!`);
 				onFinish();
 			} catch {

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

@@ -28,9 +28,14 @@ import {checkAccess} from "@/utils/permissions";
 import {PermissionType} from "@/interfaces/permissions";
 import usePermissions from "@/hooks/usePermissions";
 import useUserBalance from "@/hooks/useUserBalance";
+import usePagination from "@/hooks/usePagination";
 const columnHelper = createColumnHelper<User>();
 const searchFields = [["name"], ["email"], ["corporateInformation", "companyInformation", "name"]];
 
+const corporatesHash = {
+	type: "corporate",
+};
+
 const CompanyNameCell = ({users, user, groups}: {user: User; users: User[]; groups: Group[]}) => {
 	const [companyName, setCompanyName] = useState("");
 	const [isLoading, setIsLoading] = useState(false);
@@ -58,18 +63,19 @@ export default function UserList({
 	const [sorter, setSorter] = useState<string>();
 	const [displayUsers, setDisplayUsers] = useState<User[]>([]);
 	const [selectedUser, setSelectedUser] = useState<User>();
-	const [page, setPage] = useState(0);
 
 	const userHash = useMemo(
 		() => ({
 			type,
-			size: 16,
-			page,
 		}),
-		[type, page],
+		[type],
 	);
 
 	const {users, total, isLoading, reload} = useUsers(userHash);
+	const {users: corporates} = useUsers(corporatesHash);
+
+	const totalUsers = useMemo(() => [...users, ...corporates], [users, corporates]);
+
 	const {permissions} = usePermissions(user?.id || "");
 	const {balance} = useUserBalance();
 	const {groups} = useGroups({
@@ -94,9 +100,9 @@ export default function UserList({
 		(async () => {
 			if (users && users.length > 0) {
 				const filteredUsers = filters.reduce((d, f) => d.filter(f), users);
-				const sortedUsers = await asyncSorter<User>(filteredUsers, sortFunction);
+				// const sortedUsers = await asyncSorter<User>(filteredUsers, sortFunction);
 
-				setDisplayUsers([...sortedUsers]);
+				setDisplayUsers([...filteredUsers]);
 			}
 		})();
 		// eslint-disable-next-line react-hooks/exhaustive-deps
@@ -354,7 +360,7 @@ export default function UserList({
 					<SorterArrow name="companyName" />
 				</button>
 			) as any,
-			cell: (info) => <CompanyNameCell user={info.row.original} users={users} groups={groups} />,
+			cell: (info) => <CompanyNameCell user={info.row.original} users={totalUsers} groups={groups} />,
 		}),
 		columnHelper.accessor("subscriptionExpirationDate", {
 			header: (
@@ -505,10 +511,14 @@ export default function UserList({
 		return a.id.localeCompare(b.id);
 	};
 
-	const {rows: filteredRows, renderSearch} = useListSearch<User>(searchFields, displayUsers);
+	const {rows: filteredRows, renderSearch, text: searchText} = useListSearch<User>(searchFields, displayUsers);
+	const {items, setPage, render: renderPagination} = usePagination<User>(filteredRows, 16);
+
+	// eslint-disable-next-line react-hooks/exhaustive-deps
+	useEffect(() => setPage(0), [searchText]);
 
 	const table = useReactTable({
-		data: filteredRows,
+		data: items,
 		columns: (!showDemographicInformation ? defaultColumns : demographicColumns) as any,
 		getCoreRowModel: getCoreRowModel(),
 	});
@@ -624,27 +634,7 @@ export default function UserList({
 							Download List
 						</Button>
 					</div>
-					<div className="w-full flex gap-2 justify-between">
-						<Button
-							isLoading={isLoading}
-							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 * 16 + 1} - {(page + 1) * 16 > total ? total : (page + 1) * 16} / {total}
-							</span>
-							<Button
-								isLoading={isLoading}
-								className="w-[200px]"
-								disabled={page * 16 >= total}
-								onClick={() => setPage((prev) => prev + 1)}>
-								Next Page
-							</Button>
-						</div>
-					</div>
+					{renderPagination()}
 					<table className="rounded-xl bg-mti-purple-ultralight/40 w-full">
 						<thead>
 							{table.getHeaderGroups().map((headerGroup) => (

src/pages/(admin)/UserCreator.tsx

@@ -141,7 +141,11 @@ export default function UserCreator({user, users, permissions, onFinish}: Props)
 				setType("student");
 				setPosition(undefined);
 			})
-			.catch(() => toast.error("Something went wrong! Please try again later!"))
+			.catch((error) => {
+				const data = error?.response?.data;
+				if (!!data?.message) return toast.error(data.message);
+				toast.error("Something went wrong! Please try again later!");
+			})
 			.finally(() => setIsLoading(false));
 	};
 

src/pages/api/assignments/corporate/[id].ts

@@ -22,7 +22,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
 async function GET(req: NextApiRequest, res: NextApiResponse) {
 	const {id} = req.query as {id: string};
 
-	const assigners = await getAllAssignersByCorporate(id);
+	const assigners = await getAllAssignersByCorporate(id, req.session.user!.type);
 	const assignments = await getAssignmentsByAssigners([...assigners, id]);
 
 	res.status(200).json(uniqBy(assignments, "id"));

src/pages/api/assignments/corporate/index.ts

@@ -29,7 +29,7 @@ async function GET(req: NextApiRequest, res: NextApiResponse) {
 	try {
 		const idsList = ids.split(",");
 
-		const assignments = await getAssignmentsForCorporates(idsList, startDateParsed, endDateParsed);
+		const assignments = await getAssignmentsForCorporates(req.session.user!.type, idsList, startDateParsed, endDateParsed);
 		res.status(200).json(assignments);
 	} catch (err: any) {
 		res.status(500).json({error: err.message});

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

@@ -11,14 +11,21 @@ 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";
+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;
@@ -40,14 +47,12 @@ 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
 	if (req.session.user) {
-    if (
-      !checkAccess(req.session.user, ["mastercorporate", "corporate", "developer", "admin"])
-    ) {
+		if (!checkAccess(req.session.user, ["mastercorporate", "corporate", "developer", "admin"])) {
 			return res.status(403).json({error: "Unauthorized"});
 		}
 		const {
@@ -65,25 +70,20 @@ 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(
-      ids,
-      startDateParsed,
-      endDateParsed
-    );
+		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) => {
 				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,21 +91,14 @@ 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(
-          (gs) => gs.user === assigner
-        );
+				const gradingSystem = assignerUsersGradingSystems.find((gs) => gs.user === assigner);
 				if (gradingSystem) {
-          const bandScore = calculateBandScore(
-            correct,
-            total,
-            "level",
-            user.focus
-          );
+					const bandScore = calculateBandScore(correct, total, "level", user?.focus || "academic");
 					return {
-            label: getGradingLabel(bandScore, gradingSystem?.steps || []),
+						label: getGradingLabel(bandScore, gradingSystem.steps || []),
 						score: bandScore,
 					};
 				}
@@ -117,27 +110,22 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
 		const tableResults = assignments
 			.reduce((accmA: TableData[], a: AssignmentWithCorporateId) => {
 				const userResults = a.assignees.map((assignee) => {
-          const userStats =
-            a.results.find((r) => r.user === assignee)?.stats || [];
+					const userStats = 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(
-            a.exams,
-            a.assigner,
-            userData!,
-            correct,
-            total
-          );
+					const {label: level, score} = getGradingSystemHelper(a.exams, a.assigner, userData!, correct, total);
 
-          console.log("Level", level);
 					const commonData = {
 						user: userData?.name || "",
 						email: userData?.email || "",
+						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,
@@ -151,14 +139,22 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
 						};
 					}
 
-          const partsData = userStats.every((e) => e.module === "level")
-            ? userStats.reduce((acc, e, index) => {
-                return {
-                  ...acc,
-                  [`part${index}`]: `${e.score.correct}/${e.score.total}`,
-                };
-              }, {})
-            : {};
+					let data: {total: number; correct: number}[] = [];
+					if (a.exams.every((x) => x.module === "level")) {
+						const exam = exams.find((x) => x.id === a.exams.find((x) => x.assignee === assignee)?.id) as LevelExam;
+						data = exam.parts.map((x) => {
+							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,
@@ -186,6 +182,14 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
 				label: "Email",
 				value: (entry: TableData) => entry.email,
 			},
+			{
+				label: "Student ID",
+				value: (entry: TableData) => entry.studentID,
+			},
+			{
+				label: "Passport ID",
+				value: (entry: TableData) => entry.passportID,
+			},
 			...(displaySelection
 				? [
 						{
@@ -203,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,
 			},
 			{
@@ -223,9 +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) => {
@@ -241,8 +243,7 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
 		const fileRef = ref(storage, refName);
 		// upload the pdf to storage
 		await uploadBytes(fileRef, buffer, {
-      contentType:
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+			contentType: "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 (
-    user.type === "admin" ||
-    user.type === "developer" ||
-    user.id === group.admin
-  ) {
+	if (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 (
-    user.type === "admin" ||
-    user.type === "developer" ||
-    user.id === group.admin
-  ) {
+	if (user.type === "admin" || user.type === "developer" || user.id === group.admin) {
 		if ("participants" in req.body) {
-      const newParticipants = (req.body.participants as string[]).filter(
-        (x) => !group.participants.includes(x),
-      );
-      await Promise.all(
-        newParticipants.map(
-          async (p) => await updateExpiryDateOnGroup(p, group.admin),
-        ),
-      );
+			const newParticipants = (req.body.participants as string[]).filter((x) => !group.participants.includes(x));
+			await Promise.all(newParticipants.map(async (p) => await updateExpiryDateOnGroup(p, group.admin)));
 		}
 
-    await db.collection("grading").updateOne(
-      { id: req.session.user.id },
-      { $set: {id: id, ...req.body} },
-      { upsert: true }
-    );
+		await db.collection("groups").updateOne({id: req.session.user.id}, {$set: {id, ...req.body}}, {upsert: true});
 
 		res.status(200).json({ok: true});
 		return;

src/pages/api/make_user.ts

@@ -218,6 +218,8 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
 			return res.status(200).json({ok: true});
 		})
 		.catch((error) => {
+			if (error.code.includes("email-already-in-use")) return res.status(403).json({error, message: "E-mail is already in the platform."});
+
 			console.log(`Failing - ${email}`);
 			console.log(error);
 			return res.status(401).json({error});

src/pages/api/sessions/index.ts

@@ -24,7 +24,7 @@ async function get(req: NextApiRequest, res: NextApiResponse) {
 	const {user} = req.query as {user?: string};
 
 	const q = user ? {user: user} : {};
-	const sessions = await db.collection("sessions").find<Session>(q).toArray();
+	const sessions = await db.collection("sessions").find<Session>(q).limit(10).toArray();
 
 	res.status(200).json(
 		sessions.filter((x) => {
@@ -42,11 +42,7 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
 	}
 	const session = req.body;
 
-	await db.collection("sessions").updateOne(
-		{ id: session.id},
-		{ $set: session },
-		{ upsert: true }
-	);
+	await db.collection("sessions").updateOne({id: session.id}, {$set: session}, {upsert: true});
 
 	res.status(200).json({ok: true});
 }

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], "id"), total});
 }

src/pages/index.tsx

@@ -68,18 +68,18 @@ interface Props {
 	linkedCorporate?: CorporateUser | MasterCorporateUser;
 }
 
-export default function Home({linkedCorporate}: Props) {
+export default function Home({user: propsUser, linkedCorporate}: Props) {
+	const [user, setUser] = useState(propsUser);
 	const [showDiagnostics, setShowDiagnostics] = useState(false);
 	const [showDemographicInput, setShowDemographicInput] = useState(false);
 	const [selectedScreen, setSelectedScreen] = useState<Type>("admin");
 
-	const {user, mutateUser} = useUser({redirectTo: "/login"});
+	const {mutateUser} = useUser({redirectTo: "/login"});
 	const router = useRouter();
 
 	useEffect(() => {
 		if (user) {
-			console.log(user.demographicInformation);
-			setShowDemographicInput(!user.demographicInformation || !user.demographicInformation.country || !user.demographicInformation.phone);
+			// setShowDemographicInput(!user.demographicInformation || !user.demographicInformation.country || !user.demographicInformation.phone);
 			setShowDiagnostics(user.isFirstLogin && user.type === "student");
 		}
 	}, [user]);
@@ -131,7 +131,13 @@ export default function Home({linkedCorporate}: Props) {
 					<link rel="icon" href="/favicon.ico" />
 				</Head>
 				<Layout user={user} navDisabled>
-					<DemographicInformationInput mutateUser={mutateUser} user={user} />
+					<DemographicInformationInput
+						mutateUser={(user) => {
+							setUser(user);
+							mutateUser(user);
+						}}
+						user={user}
+					/>
 				</Layout>
 			</>
 		);

src/utils/assignments.be.ts

@@ -1,6 +1,7 @@
 import client from "@/lib/mongodb";
 import {Assignment} from "@/interfaces/results";
 import {getAllAssignersByCorporate} from "@/utils/groups.be";
+import {Type} from "@/interfaces/user";
 
 const db = client.db(process.env.MONGODB_DB);
 
@@ -26,13 +27,20 @@ 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) => {
+export const getAssignmentsForCorporates = async (userType: Type, idsList: string[], startDate?: Date, endDate?: Date) => {
 	const assigners = await Promise.all(
 		idsList.map(async (id) => {
-			const assigners = await getAllAssignersByCorporate(id);
+			const assigners = await getAllAssignersByCorporate(id, userType);
 			return {
 				corporateId: id,
 				assigners,
@@ -57,4 +65,4 @@ export const getAssignmentsForCorporates = async (idsList: string[], startDate?:
 	);
 
 	return assignments.flat();
-}
+};

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,
@@ -18,18 +40,18 @@ export const getExams = async (
 	variant?: Variant,
 	instructorGender?: InstructorGender,
 ): Promise<Exam[]> => {
+	const allExams = await db
+		.collection(module)
+		.find<Exam>({
+			isDiagnostic: false,
+		})
+		.toArray();
 
-	const allExams = await db.collection(module).find<Exam>({
-		isDiagnostic: false
-	  }).toArray();
-
-	const shuffledPublicExams = (
-		shuffle(
+	const shuffledPublicExams = shuffle(
 		allExams.map((doc) => ({
 			...doc,
 			module,
 		})) as Exam[],
-		)
 	).filter((x) => !x.private);
 
 	let exams: Exam[] = await filterByOwners(shuffledPublicExams, userId);
@@ -39,9 +61,12 @@ export const getExams = async (
 	exams = await filterByPreference(db, exams, module, userId);
 
 	if (avoidRepeated === "true") {
-		const stats = await db.collection("stats").find<Stat>({
-			user: userId
-		}).toArray();
+		const stats = await db
+			.collection("stats")
+			.find<Stat>({
+				user: userId,
+			})
+			.toArray();
 
 		const filteredExams = exams.filter((x) => !stats.map((s) => s.exam).includes(x.id));
 
@@ -78,7 +103,7 @@ const filterByOwners = async (exams: Exam[], userID?: string) => {
 
 const filterByDifficulty = async (db: Db, exams: Exam[], module: Module, userID?: string) => {
 	if (!userID) return exams;
-	const user = await db.collection("users").findOne<User>({ _id: new ObjectId(userID) });
+	const user = await db.collection("users").findOne<User>({id: userID});
 	if (!user) return exams;
 
 	const difficulty = user.levels[module] <= 3 ? "easy" : user.levels[module] <= 6 ? "medium" : "hard";
@@ -92,7 +117,7 @@ const filterByPreference = async (db: Db, exams: Exam[], module: Module, userID?
 
 	if (!userID) return exams;
 
-	const user = await db.collection("users").findOne<StudentUser | DeveloperUser>({ _id: new ObjectId(userID) });
+	const user = await db.collection("users").findOne<StudentUser | DeveloperUser>({id: userID});
 	if (!user) return exams;
 
 	if (!["developer", "student"].includes(user.type)) return exams;

src/utils/groups.be.ts

@@ -1,8 +1,9 @@
 import {app} from "@/firebase";
-import {CorporateUser, Group, MasterCorporateUser, StudentUser, TeacherUser, User} from "@/interfaces/user";
+import {Assignment} from "@/interfaces/results";
+import {CorporateUser, Group, MasterCorporateUser, StudentUser, TeacherUser, Type, 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);
@@ -70,18 +71,11 @@ export const getUsersGroups = async (ids: string[]) => {
 		.toArray();
 };
 
-export const getAllAssignersByCorporate = async (corporateID: string): Promise<string[]> => {
-	const groups = await getUserGroups(corporateID);
-	const groupUsers = (await Promise.all(groups.map(async (g) => await Promise.all(g.participants.map(getUser)))))
-		.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,
-		),
-	);
+export const getAllAssignersByCorporate = async (corporateID: string, type: Type): Promise<string[]> => {
+	const linkedTeachers = await getLinkedUsers(corporateID, type, "teacher");
+	const linkedCorporates = await getLinkedUsers(corporateID, type, "corporate");
 
-	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) => {

src/utils/search.ts

@@ -1,4 +1,3 @@
-
 /*fields example = [
     ['id'],
     ['companyInformation', 'companyInformation', 'name']
@@ -26,4 +25,4 @@ export const search = (text: string, fields: string[][], rows: any[]) => {
 			}
 		});
 	});
-}
+};

src/utils/users.be.ts

@@ -56,7 +56,7 @@ export async function getLinkedUsers(
 
 	const participants = uniq([
 		...adminGroups.flatMap((x) => x.participants),
-		...groups.flat().flatMap((x) => x.participants),
+		...(userType === "mastercorporate" ? groups.flat().flatMap((x) => x.participants) : []),
 		...(userType === "teacher" ? belongingGroups.flatMap((x) => x.participants) : []),
 	]);