From 2146f5794158dc5fb8fb663c53e97a75fcd6f1eb Mon Sep 17 00:00:00 2001 From: Tiago Ribeiro Date: Mon, 23 Dec 2024 15:09:35 +0000 Subject: [PATCH] Solved a bug --- src/pages/dashboard/admin.tsx | 3 +-- src/pages/dashboard/developer.tsx | 1 - src/pages/dashboard/mastercorporate.tsx | 4 +++- src/utils/users.be.ts | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/pages/dashboard/admin.tsx b/src/pages/dashboard/admin.tsx index 2e53d579..ab5e7931 100644 --- a/src/pages/dashboard/admin.tsx +++ b/src/pages/dashboard/admin.tsx @@ -139,7 +139,6 @@ export default function Dashboard({ value={entities.length} color="purple" /> - router.push("/statistical")} label="Entity Statistics" @@ -149,7 +148,7 @@ export default function Dashboard({ router.push("/users/performance")} label="Student Performance" - value={students.length} + value={usersCount.student} color="purple" /> - router.push("/statistical")} label="Entity Statistics" diff --git a/src/pages/dashboard/mastercorporate.tsx b/src/pages/dashboard/mastercorporate.tsx index ef8cfb52..6afa9b0e 100644 --- a/src/pages/dashboard/mastercorporate.tsx +++ b/src/pages/dashboard/mastercorporate.tsx @@ -78,7 +78,9 @@ export default function Dashboard({ user, users, userCounts, entities, assignmen const totalCount = useMemo(() => userCounts.corporate + userCounts.mastercorporate + userCounts.student + userCounts.teacher, [userCounts]) - const totalLicenses = useMemo(() => entities.reduce((acc, curr) => acc + curr.licenses, 0), [entities]) + + console.log(userCounts) + const totalLicenses = useMemo(() => entities.reduce((acc, curr) => acc + parseInt(curr.licenses.toString()), 0), [entities]) const router = useRouter(); diff --git a/src/utils/users.be.ts b/src/utils/users.be.ts index 92b3b249..7997aef1 100644 --- a/src/utils/users.be.ts +++ b/src/utils/users.be.ts @@ -171,7 +171,7 @@ export const countAllowedUsers = async (user: User, entities: EntityWithRoles[]) const student = await countEntitiesUsers(mapBy(studentsAllowedEntities, 'id'), { type: "student" }) const teacher = await countEntitiesUsers(mapBy(teachersAllowedEntities, 'id'), { type: "teacher" }) const corporate = await countEntitiesUsers(mapBy(corporateAllowedEntities, 'id'), { type: "corporate" }) - const masterCorporate = await countEntitiesUsers(mapBy(masterCorporateAllowedEntities, 'id'), { type: "mastercorporate" }) + const mastercorporate = await countEntitiesUsers(mapBy(masterCorporateAllowedEntities, 'id'), { type: "mastercorporate" }) - return { student, teacher, corporate, masterCorporate } + return { student, teacher, corporate, mastercorporate } }