Improved some of the querying for the assignments

src/dashboards/MasterCorporate/MasterStatistical.tsx

@@ -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
@@ -71,44 +72,44 @@ const MasterStatistical = (props: Props) => {
 
 	const tableResults = React.useMemo(
 		() =>
-			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 commonData = {
-							user: userData?.name || "N/A",
-							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: null,
-							};
-						}
-
+			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 = getUserName(users.find((u) => u.id === a.assigner));
+					const commonData = {
+						user: userData?.name || "N/A",
+						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: userStats.reduce((n, e) => n + e.score.correct, 0),
-							submitted: true,
-							date: moment.max(userStats.map((e) => moment(e.date))),
+							correct: 0,
+							submitted: false,
+							date: null,
 						};
-					}) as TableData[];
+					}
 
-					return [...accmA, ...userResults];
-				}, [])
-				.filter((x) => x.user !== "N/A"),
+					return {
+						...commonData,
+						correct: userStats.reduce((n, e) => n + e.score.correct, 0),
+						submitted: true,
+						date: moment.max(userStats.map((e) => moment(e.date))),
+					};
+				}) as TableData[];
+
+				return [...accmA, ...userResults];
+			}, []),
 		[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);
 
@@ -171,13 +172,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",
@@ -197,7 +191,7 @@ const MasterStatistical = (props: Props) => {
 			},
 		}),
 		columnHelper.accessor("correct", {
-			header: "Correct",
+			header: "Score",
 			id: "correct",
 			cell: (info) => {
 				return <span>{info.getValue()}</span>;

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();