From 7bfd0002131ba9c1e72d2c13c6dfc9928ece83c1 Mon Sep 17 00:00:00 2001
From: Tiago Ribeiro <tiago.ribeiro@ecrop.dev>
Date: Wed, 11 Sep 2024 11:29:48 +0100
Subject: [PATCH] Solved a problem where it was only getting the first 25
 students

---
 src/dashboards/Corporate/index.tsx | 31 ++----------------------------
 src/utils/search.ts                |  1 -
 2 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/src/dashboards/Corporate/index.tsx b/src/dashboards/Corporate/index.tsx
index 9e9283cf..e16028b3 100644
--- a/src/dashboards/Corporate/index.tsx
+++ b/src/dashboards/Corporate/index.tsx
@@ -55,6 +55,7 @@ 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;
@@ -82,8 +83,6 @@ export default function CorporateDashboard({user, linkedCorporate}: Props) {
 	const {assignments, isLoading: isAssignmentsLoading, reload: reloadAssignments} = useAssignments({corporate: user.id});
 	const {balance} = useUserBalance();
 
-	useEffect(() => console.log(assignments), [assignments]);
-
 	const {users: students, total: totalStudents, reload: reloadStudents, isLoading: isStudentsLoading} = useUsers(studentHash);
 	const {users: teachers, total: totalTeachers, reload: reloadTeachers, isLoading: isTeachersLoading} = useUsers(teacherHash);
 
@@ -123,32 +122,6 @@ 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);
 
@@ -247,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 (
 		<>
diff --git a/src/utils/search.ts b/src/utils/search.ts
index e6153089..87b2cfc1 100644
--- a/src/utils/search.ts
+++ b/src/utils/search.ts
@@ -17,7 +17,6 @@ export const search = (text: string, fields: string[][], rows: any[]) => {
 		return fields.some((fieldsKeys) => {
 			const value = getFieldValue(fieldsKeys, row);
 			if (typeof value === "string") {
-				console.log(value, searchText, value.toLowerCase().includes(searchText));
 				return value.toLowerCase().includes(searchText);
 			}