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

Fixed an issue after merging

Browse Source
This commit is contained in:
Joao Ramos
2024-09-08 01:23:56 +01:00
parent 898edb152f
commit f9f29eabb3
3 changed files with 225 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/dashboards/MasterCorporate/MasterStatisticalPage.tsx
View File

@@ -7,23 +7,14 @@ import {BsArrowLeft} from "react-icons/bs";
import MasterStatistical from "./MasterStatistical";
interface Props {
user: User;
groupedByNameCorporates: Record<string, CorporateUser[]>;
}
const MasterStatisticalPage = () => {
const MasterStatisticalPage = ({ groupedByNameCorporates }: Props) => {
const {users} = useUsers();
const router = useRouter();
const groupedByNameCorporates = useMemo(
() =>
groupBy(
users.filter((x) => x.type === "corporate"),
(x: CorporateUser) => x.corporateInformation?.companyInformation?.name || "N/A",
),
[users],
);
const groupedByNameCorporateIds = useMemo(
() =>
Object.keys(groupedByNameCorporates).reduce((accm, x) => {

18
src/dashboards/MasterCorporate/index.tsx
View File

@@ -129,6 +129,20 @@ export default function MasterCorporateDashboard({user}: Props) {
</div>
);
const {users} = useUsers();
const groupedByNameCorporates = useMemo(
() =>
groupBy(
users.filter((x) => x.type === "corporate"),
(x: CorporateUser) => x.corporateInformation?.companyInformation?.name || "N/A",
) as Record<string, CorporateUser[]>,
[users],
);
const groupedByNameCorporatesKeys = Object.keys(groupedByNameCorporates);
const GroupsList = () => {
return (
<>
@@ -148,7 +162,7 @@ export default function MasterCorporateDashboard({user}: Props) {
};
if (router.asPath === "/#studentsPerformance") return <StudentPerformancePage user={user} />;
if (router.asPath === "/#statistical") return <MasterStatisticalPage />;
if (router.asPath === "/#statistical") return <MasterStatisticalPage groupedByNameCorporates={groupedByNameCorporates} />;
if (router.asPath === "/#groups") return <GroupsList />;
if (router.asPath === "/#students")
@@ -360,7 +374,7 @@ export default function MasterCorporateDashboard({user}: Props) {
color="purple"
onClick={() => router.push("/#corporate")}
/>
<IconCard Icon={BsBank} label="Corporate" value={totalCorporate} isLoading={isCorporatesLoading} color="purple" />
<IconCard Icon={BsBank} label="Corporate" value={groupedByNameCorporatesKeys.length} isLoading={isCorporatesLoading} color="purple" />
<IconCard
Icon={BsPersonFillGear}
isLoading={isStudentsLoading}