Not shown when not completed
This commit is contained in:
@@ -59,7 +59,6 @@ const MasterStatistical = (props: Props) => {
|
|||||||
const [endDate, setEndDate] = React.useState<Date | null>(moment().endOf("year").toDate());
|
const [endDate, setEndDate] = React.useState<Date | null>(moment().endOf("year").toDate());
|
||||||
|
|
||||||
const {assignments} = useAssignmentsCorporates({
|
const {assignments} = useAssignmentsCorporates({
|
||||||
// corporates: [...corporates, "tYU0HTiJdjMsS8SB7XJsUdMMP892"],
|
|
||||||
corporates: selectedCorporates,
|
corporates: selectedCorporates,
|
||||||
startDate,
|
startDate,
|
||||||
endDate,
|
endDate,
|
||||||
@@ -69,38 +68,40 @@ const MasterStatistical = (props: Props) => {
|
|||||||
|
|
||||||
const tableResults = React.useMemo(
|
const tableResults = React.useMemo(
|
||||||
() =>
|
() =>
|
||||||
assignments.reduce((accmA: TableData[], a: AssignmentWithCorporateId) => {
|
assignments
|
||||||
const userResults = a.assignees.map((assignee) => {
|
.reduce((accmA: TableData[], a: AssignmentWithCorporateId) => {
|
||||||
const userStats = a.results.find((r) => r.user === assignee)?.stats || [];
|
const userResults = a.assignees.map((assignee) => {
|
||||||
const userData = users.find((u) => u.id === assignee);
|
const userStats = a.results.find((r) => r.user === assignee)?.stats || [];
|
||||||
const corporate = users.find((u) => u.id === a.assigner)?.name || "";
|
const userData = users.find((u) => u.id === assignee);
|
||||||
const commonData = {
|
const corporate = users.find((u) => u.id === a.assigner)?.name || "";
|
||||||
user: userData?.name || "",
|
const commonData = {
|
||||||
email: userData?.email || "",
|
user: userData?.name || "N/A",
|
||||||
userId: assignee,
|
email: userData?.email || "N/A",
|
||||||
corporateId: a.corporateId,
|
userId: assignee,
|
||||||
corporate,
|
corporateId: a.corporateId,
|
||||||
assignment: a.name,
|
corporate,
|
||||||
};
|
assignment: a.name,
|
||||||
if (userStats.length === 0) {
|
};
|
||||||
|
if (userStats.length === 0) {
|
||||||
|
return {
|
||||||
|
...commonData,
|
||||||
|
correct: 0,
|
||||||
|
submitted: false,
|
||||||
|
// date: moment(),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
...commonData,
|
...commonData,
|
||||||
correct: 0,
|
correct: userStats.reduce((n, e) => n + e.score.correct, 0),
|
||||||
submitted: false,
|
submitted: true,
|
||||||
// date: moment(),
|
date: moment.max(userStats.map((e) => moment(e.date))),
|
||||||
};
|
};
|
||||||
}
|
}) as TableData[];
|
||||||
|
|
||||||
return {
|
return [...accmA, ...userResults];
|
||||||
...commonData,
|
}, [])
|
||||||
correct: userStats.reduce((n, e) => n + e.score.correct, 0),
|
.filter((x) => x.user !== "N/A"),
|
||||||
submitted: true,
|
|
||||||
date: moment.max(userStats.map((e) => moment(e.date))),
|
|
||||||
};
|
|
||||||
}) as TableData[];
|
|
||||||
|
|
||||||
return [...accmA, ...userResults];
|
|
||||||
}, []),
|
|
||||||
[assignments, users],
|
[assignments, users],
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user