devops/encoach_frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into migration-mongodb

Browse Source
This commit is contained in:
Tiago Ribeiro
2024-09-07 23:09:37 +01:00
parent 15cc7c8cc9 34bc9df9ea
commit cdd42b2f07
4 changed files with 135 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/dashboards/Corporate/MasterStatisticalPage.tsx Normal file
View File

@@ -0,0 +1,45 @@
import useUsers, {userHashStudent, userHashTeacher} from "@/hooks/useUsers";
import {CorporateUser, User} from "@/interfaces/user";
import {useRouter} from "next/router";
import {useMemo} from "react";
import {BsArrowLeft} from "react-icons/bs";
import MasterStatistical from "../MasterCorporate/MasterStatistical";
interface Props {
user: CorporateUser;
}
const MasterStatisticalPage = ({user}: Props) => {
const {users: students} = useUsers(userHashStudent);
const {users: teachers} = useUsers(userHashTeacher);
// 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 router = useRouter();
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} />
</>
);
};
export default MasterStatisticalPage;

1
src/dashboards/Corporate/index.tsx
View File

@@ -53,6 +53,7 @@ import {futureAssignmentFilter, pastAssignmentFilter, archivedAssignmentFilter,
import useUserBalance from "@/hooks/useUserBalance"; import useUserBalance from "@/hooks/useUserBalance";
import AssignmentsPage from "../views/AssignmentsPage"; import AssignmentsPage from "../views/AssignmentsPage";
import StudentPerformancePage from "./StudentPerformancePage"; import StudentPerformancePage from "./StudentPerformancePage";
import MasterStatistical from "../MasterCorporate/MasterStatistical";
interface Props { interface Props {
user: CorporateUser; user: CorporateUser;

94
src/dashboards/MasterCorporate/MasterStatistical.tsx
View File

@@ -23,6 +23,7 @@ interface GroupedCorporateUsers {
interface Props { interface Props {
corporateUsers: GroupedCorporateUsers; corporateUsers: GroupedCorporateUsers;
users: User[]; users: User[];
displaySelection?: boolean;
} }
interface TableData { interface TableData {
@@ -44,7 +45,7 @@ interface UserCount {
const searchFilters = [["email"], ["user"], ["userId"]]; const searchFilters = [["email"], ["user"], ["userId"]];
const MasterStatistical = (props: Props) => { const MasterStatistical = (props: Props) => {
const {users, corporateUsers} = props; const {users, corporateUsers, displaySelection = true} = props;
// const corporateRelevantUsers = React.useMemo( // const corporateRelevantUsers = React.useMemo(
// () => corporateUsers.filter((x) => x.type !== "student") as CorporateUser[], // () => corporateUsers.filter((x) => x.type !== "student") as CorporateUser[],
@@ -154,6 +155,17 @@ const MasterStatistical = (props: Props) => {
return <span>{info.getValue()}</span>; return <span>{info.getValue()}</span>;
}, },
}), }),
...(displaySelection
? [
columnHelper.accessor("corporate", {
header: "Corporate",
id: "corporate",
cell: (info) => {
return <span>{info.getValue()}</span>;
},
}),
]
: []),
columnHelper.accessor("corporate", { columnHelper.accessor("corporate", {
header: "Corporate", header: "Corporate",
id: "corporate", id: "corporate",
@@ -259,46 +271,48 @@ const MasterStatistical = (props: Props) => {
const consolidateResults = getStudentsConsolidateScore(); const consolidateResults = getStudentsConsolidateScore();
return ( return (
<> <>
<div className="flex flex-wrap gap-2 items-center text-center"> {displaySelection && (
<IconCard <div className="flex flex-wrap gap-2 items-center text-center">
Icon={BsBank} <IconCard
label="Consolidate" Icon={BsBank}
value={getConsolidateScoreStr(consolidateScore)} label="Consolidate"
color="purple" value={getConsolidateScoreStr(consolidateScore)}
onClick={() => { color="purple"
if (areAllSelected) { onClick={() => {
setSelectedCorporates([]); if (areAllSelected) {
return; setSelectedCorporates([]);
} return;
setSelectedCorporates(corporates); }
}} setSelectedCorporates(corporates);
isSelected={areAllSelected} }}
/> isSelected={areAllSelected}
{Object.keys(corporateUsers).map((corporateName) => { />
const group = corporateUsers[corporateName]; {Object.keys(corporateUsers).map((corporateName) => {
const isSelected = group.every((id) => selectedCorporates.includes(id)); const group = corporateUsers[corporateName];
const isSelected = group.every((id) => selectedCorporates.includes(id));
const valueHash = getCorporatesScoresHash(group); const valueHash = getCorporatesScoresHash(group);
const value = getConsolidateScoreStr(getConsolidateScore(valueHash)); const value = getConsolidateScoreStr(getConsolidateScore(valueHash));
return ( return (
<IconCard <IconCard
key={corporateName} key={corporateName}
Icon={BsBank} Icon={BsBank}
label={corporateName} label={corporateName}
value={value} value={value}
color="purple" color="purple"
onClick={() => { onClick={() => {
if (isSelected) { if (isSelected) {
setSelectedCorporates((prev) => prev.filter((x) => !group.includes(x))); setSelectedCorporates((prev) => prev.filter((x) => !group.includes(x)));
return; return;
} }
setSelectedCorporates((prev) => [...new Set([...prev, ...group])]); setSelectedCorporates((prev) => [...new Set([...prev, ...group])]);
}} }}
isSelected={isSelected} isSelected={isSelected}
/> />
); );
})} })}
</div> </div>
)}
<div className="flex gap-3 w-full"> <div className="flex gap-3 w-full">
<div className="flex flex-col gap-3"> <div className="flex flex-col gap-3">
<label className="font-normal text-base text-mti-gray-dim">Date</label> <label className="font-normal text-base text-mti-gray-dim">Date</label>

56
src/pages/api/assignments/statistical/excel.ts
View File

@@ -46,15 +46,22 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
// verify if it's a logged user that is trying to export // verify if it's a logged user that is trying to export
if (req.session.user) { if (req.session.user) {
if ( if (
!checkAccess(req.session.user, ["mastercorporate", "developer", "admin"]) !checkAccess(req.session.user, ["mastercorporate", "corporate", "developer", "admin"])
) { ) {
return res.status(401).json({ error: "Unauthorized" }); return res.status(403).json({ error: "Unauthorized" });
} }
const { ids, startDate, endDate, searchText } = req.body as { const {
ids,
startDate,
endDate,
searchText,
displaySelection = true,
} = req.body as {
ids: string[]; ids: string[];
startDate?: string; startDate?: string;
endDate?: string; endDate?: string;
searchText: string; searchText: string;
displaySelection?: boolean;
}; };
const startDateParsed = startDate ? new Date(startDate) : undefined; const startDateParsed = startDate ? new Date(startDate) : undefined;
const endDateParsed = endDate ? new Date(endDate) : undefined; const endDateParsed = endDate ? new Date(endDate) : undefined;
@@ -80,7 +87,7 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
); );
const getGradingSystemHelper = ( const getGradingSystemHelper = (
exams: {id: string; module: Module; assignee: string}[], exams: { id: string; module: Module; assignee: string }[],
assigner: string, assigner: string,
user: User, user: User,
correct: number, correct: number,
@@ -97,15 +104,18 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
"level", "level",
user.focus user.focus
); );
return { label: getGradingLabel(bandScore, gradingSystem?.steps || []), score: bandScore }; return {
label: getGradingLabel(bandScore, gradingSystem?.steps || []),
score: bandScore,
};
} }
} }
return { score: -1, label: "N/A" }; return { score: -1, label: "N/A" };
}; };
const tableResults = assignments.reduce( const tableResults = assignments
(accmA: TableData[], a: AssignmentWithCorporateId) => { .reduce((accmA: TableData[], a: AssignmentWithCorporateId) => {
const userResults = a.assignees.map((assignee) => { const userResults = a.assignees.map((assignee) => {
const userStats = const userStats =
a.results.find((r) => r.user === assignee)?.stats || []; a.results.find((r) => r.user === assignee)?.stats || [];
@@ -121,7 +131,6 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
total total
); );
console.log("Level", level); console.log("Level", level);
const commonData = { const commonData = {
user: userData?.name || "", user: userData?.name || "",
@@ -142,12 +151,14 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
}; };
} }
const partsData = userStats.every((e) => e.module === "level") ? userStats.reduce((acc, e, index) => { const partsData = userStats.every((e) => e.module === "level")
return { ? userStats.reduce((acc, e, index) => {
...acc, return {
[`part${index}`]: `${e.score.correct}/${e.score.total}` ...acc,
} [`part${index}`]: `${e.score.correct}/${e.score.total}`,
}, {}) : {}; };
}, {})
: {};
return { return {
...commonData, ...commonData,
@@ -159,9 +170,8 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
}) as TableData[]; }) as TableData[];
return [...accmA, ...userResults]; return [...accmA, ...userResults];
}, }, [])
[] .sort((a, b) => b.score - a.score);
).sort((a,b) => b.score - a.score);
// Create a new workbook and add a worksheet // Create a new workbook and add a worksheet
const workbook = new ExcelJS.Workbook(); const workbook = new ExcelJS.Workbook();
@@ -176,10 +186,14 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
label: "Email", label: "Email",
value: (entry: TableData) => entry.email, value: (entry: TableData) => entry.email,
}, },
{ ...(displaySelection
label: "Corporate", ? [
value: (entry: TableData) => entry.corporate, {
}, label: "Corporate",
value: (entry: TableData) => entry.corporate,
},
]
: []),
{ {
label: "Assignment", label: "Assignment",
value: (entry: TableData) => entry.assignment, value: (entry: TableData) => entry.assignment,