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

Updated the way groups work there

Browse Source
This commit is contained in:
Tiago Ribeiro
2024-08-19 17:03:33 +01:00
parent 10802f6bb5
commit f7da11bc69
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/dashboards/MasterCorporate.tsx
View File

@@ -53,7 +53,7 @@ interface Props {
user: MasterCorporateUser; user: MasterCorporateUser;
} }
type StudentPerformanceItem = User & {corporate?: CorporateUser; group: string}; type StudentPerformanceItem = User & {corporate?: CorporateUser; group?: Group};
const StudentPerformanceList = ({items, stats, users, groups}: {items: StudentPerformanceItem[]; stats: Stat[]; users: User[]; groups: Group[]}) => { const StudentPerformanceList = ({items, stats, users, groups}: {items: StudentPerformanceItem[]; stats: Stat[]; users: User[]; groups: Group[]}) => {
const [isShowingAmount, setIsShowingAmount] = useState(false); const [isShowingAmount, setIsShowingAmount] = useState(false);
const [availableCorporates] = useState( const [availableCorporates] = useState(
@@ -82,7 +82,7 @@ const StudentPerformanceList = ({items, stats, users, groups}: {items: StudentPe
}), }),
columnHelper.accessor("group", { columnHelper.accessor("group", {
header: "Group", header: "Group",
cell: (info) => info.getValue(), cell: (info) => info.getValue()?.name || "N/A",
}), }),
columnHelper.accessor("corporate", { columnHelper.accessor("corporate", {
header: "Corporate", header: "Corporate",
@@ -372,7 +372,7 @@ export default function MasterCorporateDashboard({user}: Props) {
.filter((x) => x.type === "student" && groups.flatMap((g) => g.participants).includes(x.id)) .filter((x) => x.type === "student" && groups.flatMap((g) => g.participants).includes(x.id))
.map((u) => ({ .map((u) => ({
...u, ...u,
group: groups.find((x) => x.participants.includes(u.id))?.name || "N/A", group: groups.find((x) => x.participants.includes(u.id)),
corporate: getCorporateUser(u, users, groups), corporate: getCorporateUser(u, users, groups),
})); }));