From fb9d11f38d877afa533d70d7cc012df90f795f5b Mon Sep 17 00:00:00 2001 From: Joao Ramos Date: Sat, 7 Sep 2024 18:19:25 +0100 Subject: [PATCH] ENCOA-200: Added Master Statistical to Corporate --- src/dashboards/Corporate.tsx | 34 ++++- src/dashboards/MasterCorporate.tsx | 1 - src/dashboards/MasterStatistical.tsx | 116 ++++++++++-------- .../api/assignments/statistical/excel.ts | 56 +++++---- 4 files changed, 131 insertions(+), 76 deletions(-) diff --git a/src/dashboards/Corporate.tsx b/src/dashboards/Corporate.tsx index 54091dd8..fdc03637 100644 --- a/src/dashboards/Corporate.tsx +++ b/src/dashboards/Corporate.tsx @@ -26,6 +26,7 @@ import { BsArrowRepeat, BsPlus, BsEnvelopePaper, + BsDatabase, } from "react-icons/bs"; import UserCard from "@/components/UserCard"; import useGroups from "@/hooks/useGroups"; @@ -52,7 +53,7 @@ import {getUserCompanyName} from "@/resources/user"; import {futureAssignmentFilter, pastAssignmentFilter, archivedAssignmentFilter, activeAssignmentFilter} from "@/utils/assignments"; import useUserBalance from "@/hooks/useUserBalance"; import AssignmentsPage from "./views/AssignmentsPage"; - +import MasterStatistical from "./MasterStatistical"; interface Props { user: CorporateUser; linkedCorporate?: CorporateUser | MasterCorporateUser; @@ -278,6 +279,30 @@ export default function CorporateDashboard({user, linkedCorporate}: Props) { return calculateAverageLevel(levels); }; + // 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 ( + <> +
+
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"> + + Back +
+

Master Statistical

+
+ + + ); + }; + const DefaultDashboard = () => ( <> {!!linkedCorporate && ( @@ -336,6 +361,12 @@ export default function CorporateDashboard({user, linkedCorporate}: Props) { color="purple" onClick={() => router.push("/#studentsPerformance")} /> + router.push("/#statistical")} + />