-
- data={filterUsers(
- items.sort(
- (a, b) =>
- averageLevelCalculator(
- users,
- stats.filter((x) => x.user === b.id),
- ) -
- averageLevelCalculator(
- users,
- stats.filter((x) => x.user === a.id),
- ),
- ),
- )}
- columns={columns}
- />
-
- );
+ return (
+
-
- Show Utilization
-
-
-
-
-
-
-
-
-
-
-
- Filters
-
-
+
+ data={filterUsers(
+ items.sort(
+ (a, b) =>
+ averageLevelCalculator(
+ users,
+ stats.filter((x) => x.user === b.id)
+ ) -
+ averageLevelCalculator(
+ users,
+ stats.filter((x) => x.user === a.id)
+ )
+ )
+ )}
+ columns={columns}
+ />
+
+ );
};
-export default function MasterCorporateDashboard({user}: Props) {
- const [page, setPage] = useState("");
- const [selectedUser, setSelectedUser] = useState
+
+ Show Utilization
+
+
+
+
+
+
+
+
+
+
+
+ Filters
+
+ 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">
- 
-
- );
+ const UserDisplay = (displayUser: User) => (
+
- {displayUser.name}
- {displayUser.email}
-
- 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"
+ >
+
+
+ );
- const StudentsList = () => {
- const filter = (x: User) =>
- x.type === "student" && (!!selectedUser ? corporateUserGroups.includes(x.id) || false : corporateUserGroups.includes(x.id));
+ const StudentsList = () => {
+ const filter = (x: User) =>
+ x.type === "student" &&
+ (!!selectedUser
+ ? corporateUserGroups.includes(x.id) || false
+ : corporateUserGroups.includes(x.id));
- return (
-
+ {displayUser.name}
+ {displayUser.email}
+
+
-
- )}
- />
- );
- };
+ return (
+ setPage("")}
- className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-
- Students ({total})
-
+
+ )}
+ />
+ );
+ };
- const TeachersList = () => {
- const filter = (x: User) =>
- x.type === "teacher" && (!!selectedUser ? corporateUserGroups.includes(x.id) || false : corporateUserGroups.includes(x.id));
+ const TeachersList = () => {
+ const filter = (x: User) =>
+ x.type === "teacher" &&
+ (!!selectedUser
+ ? corporateUserGroups.includes(x.id) || false
+ : corporateUserGroups.includes(x.id));
- return (
- setPage("")}
+ className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
+ >
+
+ Students ({total})
+
-
- )}
- />
- );
- };
+ return (
+ setPage("")}
- className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-
- Teachers ({total})
-
+
+ )}
+ />
+ );
+ };
- const corporateUserFilter = (x: User) =>
- x.type === "corporate" && (!!selectedUser ? masterCorporateUserGroups.includes(x.id) || false : masterCorporateUserGroups.includes(x.id));
+ const corporateUserFilter = (x: User) =>
+ x.type === "corporate" &&
+ (!!selectedUser
+ ? masterCorporateUserGroups.includes(x.id) || false
+ : masterCorporateUserGroups.includes(x.id));
- const CorporateList = () => {
- return (
- setPage("")}
+ className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
+ >
+
+ Teachers ({total})
+
-
- )}
- />
- );
- };
+ const CorporateList = () => {
+ return (
+ setPage("")}
- className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-
- Corporates ({total})
-
+
+ )}
+ />
+ );
+ };
- const GroupsList = () => {
- return (
- <>
- setPage("")}
+ className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
+ >
+
+ Corporates ({total})
+
-
+ const GroupsList = () => {
+ return (
+ <>
+ setPage("")}
- className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-
- Groups ({groups.length})
-
+
- setPage("")}
+ className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
+ >
+
+ Groups ({groups.length})
+
-
- setPage("")}
- className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-
-
- Reload
-
-
+
+ setPage("")}
+ className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
+ >
+
+
+ Reload
+
+
-
- setPage("")}
- className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-
-
- Reload
-
-
- Active Assignments Status
-
-
-
- Total: {assignments.filter(activeFilter).reduce((acc, curr) => acc + curr.results.length, 0)}/
- {assignments.filter(activeFilter).reduce((acc, curr) => curr.exams.length + acc, 0)}
-
- {Object.keys(groupBy(corporateAssignments, (x) => x.corporate?.id)).map((x) => (
-
-
- {getUserCompanyName(users.find((u) => u.id === x)!, users, groups)}:
-
- {groupBy(corporateAssignments, (x) => x.corporate?.id)[x].reduce((acc, curr) => curr.results.length + acc, 0)}/
- {groupBy(corporateAssignments, (x) => x.corporate?.id)[x].reduce((acc, curr) => curr.exams.length + acc, 0)}
-
-
- ))}
- Active Assignments ({assignments.filter(activeFilter).length})
-
- {assignments.filter(activeFilter).map((a) => (
- setSelectedAssignment(a)} key={a.id} />
- ))}
-
- Planned Assignments ({assignments.filter(futureFilter).length})
-
- {
- setSelectedAssignment(a);
- setIsCreatingAssignment(true);
- }}
- key={a.id}
- />
- ))}
-
- setIsCreatingAssignment(true)}
- className="w-[250px] h-[200px] flex flex-col gap-2 items-center justify-center bg-white hover:bg-mti-purple-ultralight text-mti-purple-light hover:text-mti-purple-dark border border-mti-gray-platinum hover:drop-shadow p-4 cursor-pointer rounded-xl transition ease-in-out duration-300">
-
- {assignments.filter(futureFilter).map((a) => (
- Past Assignments ({assignments.filter(pastFilter).length})
-
- {assignments.filter(pastFilter).map((a) => (
- setSelectedAssignment(a)}
- key={a.id}
- allowDownload
- reload={reloadAssignments}
- allowArchive
- allowExcelDownload
- />
- ))}
-
- Archived Assignments ({assignments.filter(archivedFilter).length})
-
- {assignments.filter(archivedFilter).map((a) => (
- setSelectedAssignment(a)}
- key={a.id}
- allowDownload
- reload={reloadAssignments}
- allowUnarchive
- allowExcelDownload
- />
- ))}
-
-
+
+ setPage("")}
+ className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
+ >
+
+
+ Reload
+
+
+ Active Assignments Status
+
+
+
+ Total:{" "}
+ {assignments
+ .filter(activeFilter)
+ .reduce((acc, curr) => acc + curr.results.length, 0)}
+ /
+ {assignments
+ .filter(activeFilter)
+ .reduce((acc, curr) => curr.exams.length + acc, 0)}
+
+ {Object.keys(
+ groupBy(corporateAssignments, (x) => x.corporate?.id)
+ ).map((x) => (
+
+
+
+ {getUserCompanyName(
+ users.find((u) => u.id === x)!,
+ users,
+ groups
+ )}
+ :{" "}
+
+
+ {groupBy(corporateAssignments, (x) => x.corporate?.id)[
+ x
+ ].reduce((acc, curr) => curr.results.length + acc, 0)}
+ /
+ {groupBy(corporateAssignments, (x) => x.corporate?.id)[
+ x
+ ].reduce((acc, curr) => curr.exams.length + acc, 0)}
+
+
+ ))}
+ + Active Assignments ({assignments.filter(activeFilter).length}) +
+
+ {assignments.filter(activeFilter).map((a) => (
+ setSelectedAssignment(a)}
+ key={a.id}
+ />
+ ))}
+
+ + Planned Assignments ({assignments.filter(futureFilter).length}) +
+
+ {
+ setSelectedAssignment(a);
+ setIsCreatingAssignment(true);
+ }}
+ key={a.id}
+ />
+ ))}
+
+ setIsCreatingAssignment(true)}
+ className="w-[250px] h-[200px] flex flex-col gap-2 items-center justify-center bg-white hover:bg-mti-purple-ultralight text-mti-purple-light hover:text-mti-purple-dark border border-mti-gray-platinum hover:drop-shadow p-4 cursor-pointer rounded-xl transition ease-in-out duration-300"
+ >
+
+ {assignments.filter(futureFilter).map((a) => (
+ + Past Assignments ({assignments.filter(pastFilter).length}) +
+
+ {assignments.filter(pastFilter).map((a) => (
+ setSelectedAssignment(a)}
+ key={a.id}
+ allowDownload
+ reload={reloadAssignments}
+ allowArchive
+ allowExcelDownload
+ />
+ ))}
+
+ + Archived Assignments ({assignments.filter(archivedFilter).length}) +
+
+ {assignments.filter(archivedFilter).map((a) => (
+ setSelectedAssignment(a)}
+ key={a.id}
+ allowDownload
+ reload={reloadAssignments}
+ allowUnarchive
+ allowExcelDownload
+ />
+ ))}
+
+
-
- setPage("")}
- className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-
- Master Statistical
-
+
+ setPage("")}
+ className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
+ >
+
+ Master Statistical
+
- Latest students
-
-
- {users
- .filter(studentFilter)
- .sort((a, b) => dateSorter(a, b, "desc", "registrationDate"))
- .map((x) => (
-
-
- Latest teachers
-
-
- {users
- .filter(teacherFilter)
- .sort((a, b) => dateSorter(a, b, "desc", "registrationDate"))
- .map((x) => (
-
-
- Highest level students
-
-
- {users
- .filter(studentFilter)
- .sort((a, b) => calculateAverageLevel(b.levels) - calculateAverageLevel(a.levels))
- .map((x) => (
-
-
- Highest exam count students
-
-
- {users
- .filter(studentFilter)
- .sort(
- (a, b) =>
- Object.keys(groupByExam(getStatsByStudent(b))).length - Object.keys(groupByExam(getStatsByStudent(a))).length,
- )
- .map((x) => (
-
-
- {
- setSelectedUser(undefined);
- if (shouldReload) reload();
- }}
- onViewStudents={
- selectedUser.type === "corporate" || selectedUser.type === "teacher"
- ? () => {
- appendUserFilters({
- id: "view-students",
- filter: (x: User) => x.type === "student",
- });
- appendUserFilters({
- id: "belongs-to-admin",
- filter: (x: User) =>
- groups
- .filter((g) => g.admin === selectedUser.id || g.participants.includes(selectedUser.id))
- .flatMap((g) => g.participants)
- .includes(x.id),
- });
+
+
+
+ );
- router.push("/list/users");
- }
- : undefined
- }
- onViewTeachers={
- selectedUser.type === "corporate" || selectedUser.type === "student"
- ? () => {
- appendUserFilters({
- id: "view-teachers",
- filter: (x: User) => x.type === "teacher",
- });
- appendUserFilters({
- id: "belongs-to-admin",
- filter: (x: User) =>
- groups
- .filter((g) => g.admin === selectedUser.id || g.participants.includes(selectedUser.id))
- .flatMap((g) => g.participants)
- .includes(x.id),
- });
+ return (
+ <>
+ setSelectedUser(undefined)}>
+ <>
+ {selectedUser && (
+
- {page === "students" &&
+ )}
+
+
+ Latest students
+
+
+ {users
+ .filter(studentFilter)
+ .sort((a, b) => dateSorter(a, b, "desc", "registrationDate"))
+ .map((x) => (
+
+
+ Latest teachers
+
+
+ {users
+ .filter(teacherFilter)
+ .sort((a, b) => dateSorter(a, b, "desc", "registrationDate"))
+ .map((x) => (
+
+
+ Highest level students
+
+
+ {users
+ .filter(studentFilter)
+ .sort(
+ (a, b) =>
+ calculateAverageLevel(b.levels) -
+ calculateAverageLevel(a.levels)
+ )
+ .map((x) => (
+
+
+ Highest exam count students
+
+
+ {users
+ .filter(studentFilter)
+ .sort(
+ (a, b) =>
+ Object.keys(groupByExam(getStatsByStudent(b))).length -
+ Object.keys(groupByExam(getStatsByStudent(a))).length
+ )
+ .map((x) => (
+
+
+ {
+ setSelectedUser(undefined);
+ if (shouldReload) reload();
+ }}
+ onViewStudents={
+ selectedUser.type === "corporate" ||
+ selectedUser.type === "teacher"
+ ? () => {
+ appendUserFilters({
+ id: "view-students",
+ filter: (x: User) => x.type === "student",
+ });
+ appendUserFilters({
+ id: "belongs-to-admin",
+ filter: (x: User) =>
+ groups
+ .filter(
+ (g) =>
+ g.admin === selectedUser.id ||
+ g.participants.includes(selectedUser.id)
+ )
+ .flatMap((g) => g.participants)
+ .includes(x.id),
+ });
- router.push("/list/users");
- }
- : undefined
- }
- user={selectedUser}
- />
-
- )}
-
-
- console.log("clicked")}
- />
- {corporateUsers.map((group) => (
- console.log("clicked", group)}
- />
- ))}
-
- {
- setStartDate(initialDate ?? moment("01/01/2023").toDate());
- if (finalDate) {
- // basicly selecting a final day works as if I'm selecting the first
- // minute of that day. this way it covers the whole day
- setEndDate(moment(finalDate).endOf("day").toDate());
- return;
+ 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 userName = users.find((u) => u.id === assignee)?.name || "";
+ const corporate = users.find((u) => u.id === a.assigner)?.name || "";
+ const commonData = {
+ user: userName,
+ corporateId: a.corporateId,
+ corporate,
+ assignment: a.name,
+ };
+ if (userStats.length === 0) {
+ return {
+ ...commonData,
+ correct: 0,
+ submitted: false,
+ // date: moment(),
+ };
}
- setEndDate(null);
- }}
- />
- console.log("clicked")}
- Icon={BsPersonFill}
- label="Consolidate Highest Student"
- color="purple"
- />
-
+ 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]
+ );
+
+ const getCorporateScores = (corporateId: string): UserCount => {
+ const corporateAssignmentsUsers = assignments
+ .filter((a) => a.corporateId === corporateId)
+ .reduce((acc, a) => acc + a.assignees.length, 0);
+
+ const corporateResults = tableResults.filter(
+ (r) => r.corporateId === corporateId
+ ).length;
+
+ return {
+ maxUserCount: corporateAssignmentsUsers,
+ userCount: corporateResults,
+ };
+ };
+
+ const corporateScores = corporates.reduce(
+ (accm, id) => ({
+ ...accm,
+ [id]: getCorporateScores(id),
+ }),
+ {}
+ ) as Record
+ {
+ if (areAllSelected) {
+ setSelectedCorporates([]);
+ return;
+ }
+ setSelectedCorporates(corporates);
+ }}
+ isSelected={areAllSelected}
+ />
+ {corporateRelevantUsers.map((group) => {
+ const isSelected = selectedCorporates.includes(group.id);
+ return (
+ {
+ if (isSelected) {
+ setSelectedCorporates(
+ selectedCorporates.filter((x) => x !== group.id)
+ );
+ return;
+ }
+ setSelectedCorporates([...selectedCorporates, group.id]);
+ }}
+ isSelected={isSelected}
+ />
+ );
+ })}
+
+
+ {
+ setStartDate(initialDate ?? moment("01/01/2023").toDate());
+ if (finalDate) {
+ // basicly selecting a final day works as if I'm selecting the first
+ // minute of that day. this way it covers the whole day
+ setEndDate(moment(finalDate).endOf("day").toDate());
+ return;
+ }
+ setEndDate(null);
+ }}
+ />
+
+
+
+
+ {table.getHeaderGroups().map((headerGroup) => (
+
+
+ | + {header.isPlaceholder + ? null + : flexRender( + header.column.columnDef.header, + header.getContext() + )} + | + ))} +
|---|
| + {flexRender(cell.column.columnDef.cell, cell.getContext())} + | + ))} +
+ console.log("clicked")}
+ Icon={BsPersonFill}
+ label="Consolidate Highest Student"
+ color="purple"
+ />
+
+
);
};
diff --git a/src/hooks/useAssignmentCorporates.tsx b/src/hooks/useAssignmentCorporates.tsx
index d6b7dc33..524b31ef 100644
--- a/src/hooks/useAssignmentCorporates.tsx
+++ b/src/hooks/useAssignmentCorporates.tsx
@@ -1,6 +1,5 @@
-import { Assignment } from "@/interfaces/results";
+import { AssignmentWithCorporateId } from "@/interfaces/results";
import axios from "axios";
-import moment from "moment";
import { useEffect, useState } from "react";
export default function useAssignmentsCorporates({
@@ -12,7 +11,7 @@ export default function useAssignmentsCorporates({
startDate: Date | null;
endDate: Date | null;
}) {
- const [assignments, setAssignments] = useState