ENCOA-269

src/interfaces/entity.ts

@@ -3,7 +3,7 @@ import { RolePermission } from "@/resources/entityPermissions";
 export interface Entity {
 	id: string;
 	label: string;
-	licenses: number
+	licenses: number;
 }
 
 export interface Role {

src/pages/stats.tsx

@@ -4,7 +4,7 @@ import {BsArrowClockwise, BsChevronLeft, BsChevronRight, BsFileEarmarkText, BsPe
 import { LinearScale, Chart as ChartJS, CategoryScale, PointElement, LineElement, Legend, Tooltip, LineController } from "chart.js";
 import { withIronSessionSsr } from "iron-session/next";
 import { sessionOptions } from "@/lib/session";
-import {useEffect, useState} from "react";
+import { useEffect, useMemo, useState } from "react";
 import useFilterRecordsByUser from "@/hooks/useFilterRecordsByUser";
 import { averageScore, totalExamsByModule, groupBySession, groupByModule, timestampToMoment, groupByDate } from "@/utils/stats";
 import useUser from "@/hooks/useUser";
@@ -25,7 +25,7 @@ import moment from "moment";
 import { Group, Stat, User } from "@/interfaces/user";
 import { Divider } from "primereact/divider";
 import Badge from "@/components/Low/Badge";
-import { mapBy, redirect, serialize } from "@/utils";
+import { filterBy, mapBy, redirect, serialize } from "@/utils";
 import { getEntitiesWithRoles } from "@/utils/entities.be";
 import { checkAccess } from "@/utils/permissions";
 import { getEntitiesUsers, getUsers } from "@/utils/users.be";
@@ -66,6 +66,7 @@ export default function Stats({ user, entities, users, groups }: Props) {
 	const [startDate, setStartDate] = useState<Date | null>(moment(new Date()).subtract(1, "weeks").toDate());
 	const [endDate, setEndDate] = useState<Date | null>(new Date());
 	const [initialStatDate, setInitialStatDate] = useState<Date>();
+	const [selectedEntity, setSelectedEntity] = useState<string>()
 
 	const [monthlyOverallScoreDate, setMonthlyOverallScoreDate] = useState<Date | null>(new Date());
 	const [monthlyModuleScoreDate, setMonthlyModuleScoreDate] = useState<Date | null>(new Date());
@@ -75,6 +76,11 @@ export default function Stats({ user, entities, users, groups }: Props) {
 
 	const { data: stats } = useFilterRecordsByUser<Stat[]>(statsUserId, !statsUserId);
 
+	const students = useMemo(() =>
+		filterBy(users, 'type', 'student').filter(x => !selectedEntity ? true : mapBy(x.entities, 'id').includes((selectedEntity))),
+		[users, selectedEntity]
+	)
+
 	useEffect(() => {
 		setInitialStatDate(
 			stats
@@ -181,26 +187,24 @@ export default function Stats({ user, entities, users, groups }: Props) {
 
 					<section className="flex flex-col gap-3">
 						<div className="w-full flex justify-between gap-4 items-center">
+							{["corporate", "teacher", "mastercorporate", "developer", "admin"].includes(user.type) && (
 								<>
-								{(user.type === "developer" || user.type === "admin") && (
 									<Select
 										className="w-full"
-										options={users.map((x) => ({value: x.id, label: `${x.name} - ${x.email}`}))}
+										options={entities.map(e => ({ value: e.id, label: e.label }))}
-										defaultValue={{value: user.id, label: `${user.name} - ${user.email}`}}
+										onChange={(value) => setSelectedEntity(value?.value || undefined)}
-										onChange={(value) => setStatsUserId(value?.value || user.id)}
+										placeholder="Select an entity..."
+										isClearable
 									/>
-								)}
-								{["corporate", "teacher", "mastercorporate"].includes(user.type) && groups.length > 0 && (
 									<Select
 										className="w-full"
-										options={users
+										options={students
-											.filter((x) => groups.flatMap((y) => y.participants).includes(x.id))
 											.map((x) => ({ value: x.id, label: `${x.name} - ${x.email}` }))}
 										defaultValue={{ value: user.id, label: `${user.name} - ${user.email}` }}
 										onChange={(value) => setStatsUserId(value?.value || user.id)}
 									/>
-								)}
 								</>
+							)}
 						</div>
 
 						{stats.length > 0 && (
@@ -244,8 +248,7 @@ export default function Stats({ user, entities, users, groups }: Props) {
 										<div className="w-full grid grid-cols-3 gap-4 items-center">
 											{[...Array(31).keys()].map((day) => {
 												const date = moment(
-													`${(day + 1).toString().padStart(2, "0")}/${
+													`${(day + 1).toString().padStart(2, "0")}/${moment(monthlyOverallScoreDate).get("month") + 1
-														moment(monthlyOverallScoreDate).get("month") + 1
 													}/${moment(monthlyOverallScoreDate).get("year")}`,
 													"DD/MM/yyyy",
 												);
@@ -319,8 +322,7 @@ export default function Stats({ user, entities, users, groups }: Props) {
 												labels: [...Array(31).keys()]
 													.map((day) => {
 														const date = moment(
-															`${(day + 1).toString().padStart(2, "0")}/${
+															`${(day + 1).toString().padStart(2, "0")}/${moment(monthlyOverallScoreDate).get("month") + 1
-																moment(monthlyOverallScoreDate).get("month") + 1
 															}/${moment(monthlyOverallScoreDate).get("year")}`,
 															"DD/MM/yyyy",
 														);
@@ -339,8 +341,7 @@ export default function Stats({ user, entities, users, groups }: Props) {
 														data: [...Array(31).keys()]
 															.map((day) => {
 																const date = moment(
-																	`${(day + 1).toString().padStart(2, "0")}/${
+																	`${(day + 1).toString().padStart(2, "0")}/${moment(monthlyOverallScoreDate).get("month") + 1
-																		moment(monthlyOverallScoreDate).get("month") + 1
 																	}/${moment(monthlyOverallScoreDate).get("year")}`,
 																	"DD/MM/yyyy",
 																);