diff --git a/package.json b/package.json
index 6bc3943b..526ca5a6 100644
--- a/package.json
+++ b/package.json
@@ -39,6 +39,7 @@
"daisyui": "^3.1.5",
"eslint": "8.33.0",
"eslint-config-next": "13.1.6",
+ "exceljs": "^4.4.0",
"express-handlebars": "^7.1.2",
"firebase": "9.19.1",
"firebase-admin": "^11.10.1",
diff --git a/src/dashboards/AssignmentCard.tsx b/src/dashboards/AssignmentCard.tsx
index 720708f7..06c68e82 100644
--- a/src/dashboards/AssignmentCard.tsx
+++ b/src/dashboards/AssignmentCard.tsx
@@ -20,6 +20,7 @@ interface Props {
reload?: Function;
allowArchive?: boolean;
allowUnarchive?: boolean;
+ allowExcelDownload?: boolean;
}
export default function AssignmentCard({
@@ -37,9 +38,11 @@ export default function AssignmentCard({
reload,
allowArchive,
allowUnarchive,
+ allowExcelDownload,
users,
}: Assignment & Props) {
const renderPdfIcon = usePDFDownload("assignments");
+ const renderExcelIcon = usePDFDownload("assignments", "excel");
const renderArchiveIcon = useAssignmentArchive(id, reload);
const renderUnarchiveIcon = useAssignmentUnarchive(id, reload);
@@ -64,6 +67,7 @@ export default function AssignmentCard({
{name}
{allowDownload && renderPdfIcon(id, "text-mti-gray-dim", "text-mti-gray-dim")}
+ {allowExcelDownload && renderExcelIcon(id, "text-mti-gray-dim", "text-mti-gray-dim")}
{allowArchive && !archived && renderArchiveIcon("text-mti-gray-dim", "text-mti-gray-dim")}
{allowUnarchive && archived && renderUnarchiveIcon("text-mti-gray-dim", "text-mti-gray-dim")}
diff --git a/src/dashboards/Corporate.tsx b/src/dashboards/Corporate.tsx
index eb6a70d5..1f50539a 100644
--- a/src/dashboards/Corporate.tsx
+++ b/src/dashboards/Corporate.tsx
@@ -377,6 +377,7 @@ export default function CorporateDashboard({user}: Props) {
allowDownload
reload={reloadAssignments}
allowArchive
+ allowExcelDownload
/>
))}
@@ -393,6 +394,7 @@ export default function CorporateDashboard({user}: Props) {
allowDownload
reload={reloadAssignments}
allowUnarchive
+ allowExcelDownload
/>
))}
diff --git a/src/dashboards/MasterCorporate.tsx b/src/dashboards/MasterCorporate.tsx
index 160f8dea..6c25f391 100644
--- a/src/dashboards/MasterCorporate.tsx
+++ b/src/dashboards/MasterCorporate.tsx
@@ -4,9 +4,9 @@ import useStats from "@/hooks/useStats";
import useUsers from "@/hooks/useUsers";
import {CorporateUser, Group, MasterCorporateUser, Stat, User} from "@/interfaces/user";
import UserList from "@/pages/(admin)/Lists/UserList";
-import {dateSorter} from "@/utils";
+import { dateSorter } from "@/utils";
import moment from "moment";
-import {useEffect, useState} from "react";
+import { useEffect, useState } from "react";
import {
BsArrowLeft,
BsClipboard2Data,
@@ -22,6 +22,7 @@ import {
BsPlus,
BsPersonFillGear,
BsFilter,
+ BsDatabase
} from "react-icons/bs";
import UserCard from "@/components/UserCard";
import useGroups from "@/hooks/useGroups";
@@ -33,10 +34,10 @@ import {groupByExam} from "@/utils/stats";
import IconCard from "./IconCard";
import GroupList from "@/pages/(admin)/Lists/GroupList";
import useFilterStore from "@/stores/listFilterStore";
-import {useRouter} from "next/router";
+import { useRouter } from "next/router";
import useCodes from "@/hooks/useCodes";
import useAssignments from "@/hooks/useAssignments";
-import {Assignment} from "@/interfaces/results";
+import { Assignment } from "@/interfaces/results";
import AssignmentView from "./AssignmentView";
import AssignmentCreator from "./AssignmentCreator";
import clsx from "clsx";
@@ -50,9 +51,10 @@ import {groupBy, uniq, uniqBy} from "lodash";
import Select from "@/components/Low/Select";
import {Menu, MenuButton, MenuItem, MenuItems} from "@headlessui/react";
import {Popover, PopoverContent, PopoverTrigger} from "@/components/ui/popover";
+import MasterStatistical from "./MasterStatistical";
interface Props {
- user: MasterCorporateUser;
+ user: MasterCorporateUser;
}
const activeFilter = (a: Assignment) =>
@@ -307,17 +309,28 @@ export default function MasterCorporateDashboard({user}: Props) {
const {codes} = useCodes(user.id);
const {groups} = useGroups({admin: user.id, userType: user.type});
- const masterCorporateUserGroups = [...new Set(groups.filter((u) => u.admin === user.id).flatMap((g) => g.participants))];
- const corporateUserGroups = [...new Set(groups.flatMap((g) => g.participants))];
+ const masterCorporateUserGroups = [
+ ...new Set(
+ groups.filter((u) => u.admin === user.id).flatMap((g) => g.participants)
+ ),
+ ];
- const {assignments, isLoading: isAssignmentsLoading, reload: reloadAssignments} = useAssignments({corporate: user.id});
+ const corporateUserGroups = [
+ ...new Set(groups.flatMap((g) => g.participants)),
+ ];
- const appendUserFilters = useFilterStore((state) => state.appendUserFilter);
- const router = useRouter();
+ const {
+ assignments,
+ isLoading: isAssignmentsLoading,
+ reload: reloadAssignments,
+ } = useAssignments({ corporate: user.id });
- useEffect(() => {
- setShowModal(!!selectedUser && page === "");
- }, [selectedUser, page]);
+ const appendUserFilters = useFilterStore((state) => state.appendUserFilter);
+ const router = useRouter();
+
+ useEffect(() => {
+ setShowModal(!!selectedUser && page === "");
+ }, [selectedUser, page]);
useEffect(() => {
setCorporateAssignments(
@@ -332,107 +345,137 @@ export default function MasterCorporateDashboard({user}: Props) {
const studentFilter = (user: User) => user.type === "student" && corporateUserGroups.includes(user.id);
const teacherFilter = (user: User) => user.type === "teacher" && corporateUserGroups.includes(user.id);
-
const getStatsByStudent = (user: User) => stats.filter((s) => s.user === user.id);
- const UserDisplay = (displayUser: User) => (
- 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">
-
-
- {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"
+ >
+
+
+ {displayUser.name}
+ {displayUser.email}
+
+
-
setPage("")}
- className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-
- Back
-
-
Students ({total})
-
+
setPage("")}
+ className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
+ >
+
+ Back
+
+
Students ({total})
+
-
setPage("")}
- className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-
- Back
-
-
Teachers ({total})
-
+
setPage("")}
+ className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
+ >
+
+ Back
+
+
Teachers ({total})
+
-
setPage("")}
- className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-
- Back
-
-
Corporates ({total})
-
+
setPage("")}
+ className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300"
+ >
+
+ Back
+
+
Corporates ({total})
+
-
setPage("")}
- className="flex gap-2 items-center text-mti-purple-light cursor-pointer hover:text-mti-purple-dark transition ease-in-out duration-300">
-
- Back
-
-
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"
+ >
+
+ Back
+
+
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"
+ >
+
+ Back
+
+
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) => (
-
- ))}
-
-
+
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),
- });
+ return (
+ <>
+ setSelectedUser(undefined)}>
+ <>
+ {selectedUser && (
+
+
{
+ 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),
- });
+ 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),
+ });
router.push("/list/users");
}
@@ -784,7 +878,8 @@ export default function MasterCorporateDashboard({user}: Props) {
{page === "corporate" && }
{page === "assignments" && }
{page === "studentsPerformance" && }
+ {page === "statistical" && }
{page === "" && }
);
-}
+}
\ No newline at end of file
diff --git a/src/dashboards/MasterStatistical.tsx b/src/dashboards/MasterStatistical.tsx
new file mode 100644
index 00000000..018039de
--- /dev/null
+++ b/src/dashboards/MasterStatistical.tsx
@@ -0,0 +1,46 @@
+import React from "react";
+import { CorporateUser } from "@/interfaces/user";
+import { BsBank, BsPersonFill } from "react-icons/bs";
+import IconCard from "./IconCard";
+import useAssignmentsCorporates from '@/hooks/useAssignmentCorporates';
+interface Props {
+ users: CorporateUser[];
+}
+const MasterStatistical = (props: Props) => {
+ const { users } = props;
+
+ const usersList = React.useMemo(() => users.map((x) => x.id), [users]);
+
+ const { assignments } = useAssignmentsCorporates({ corporates: usersList });
+
+ console.log('Assignments', assignments);
+ return (
+
+ console.log("clicked")}
+ />
+ {users.map((group) => (
+ console.log("clicked", group)}
+ />
+ ))}
+ console.log("clicked")}
+ Icon={BsPersonFill}
+ label="Consolidate Highest Student"
+ color="purple"
+ />
+
+ );
+};
+
+export default MasterStatistical;
diff --git a/src/dashboards/Teacher.tsx b/src/dashboards/Teacher.tsx
index 72eb6156..436696d5 100644
--- a/src/dashboards/Teacher.tsx
+++ b/src/dashboards/Teacher.tsx
@@ -260,6 +260,7 @@ export default function TeacherDashboard({user}: Props) {
allowDownload
reload={reloadAssignments}
allowArchive
+ allowExcelDownload
/>
))}