Removed ID and improved unknown user handling
This commit is contained in:
@@ -7,14 +7,14 @@ import {
|
||||
Text,
|
||||
Image,
|
||||
StyleSheet,
|
||||
Font,
|
||||
} from "@react-pdf/renderer";
|
||||
import { styles } from "./styles";
|
||||
import TestReportFooter from "./test.report.footer";
|
||||
import { ModuleScore } from "@/interfaces/module.scores";
|
||||
import ProgressBar from "./progress.bar";
|
||||
// import { Font } from "@react-pdf/renderer";
|
||||
|
||||
// Font.registerHyphenationCallback((word) => [word]);
|
||||
Font.registerHyphenationCallback((word) => [word]);
|
||||
|
||||
interface Props {
|
||||
date: string;
|
||||
@@ -220,7 +220,6 @@ const GroupTestReport = ({
|
||||
<Text style={customStyles.tableCell}>Date of test</Text>
|
||||
<Text style={customStyles.tableCell}>Result</Text>
|
||||
<Text style={customStyles.tableCell}>Level</Text>
|
||||
<Text style={customStyles.tableCell}>ID</Text>
|
||||
</View>
|
||||
{studentsData.map(
|
||||
({ id, name, email, gender, date, result, level }, index) => (
|
||||
@@ -239,7 +238,6 @@ const GroupTestReport = ({
|
||||
<Text style={customStyles.tableCell}>{date}</Text>
|
||||
<Text style={customStyles.tableCell}>{result}</Text>
|
||||
<Text style={customStyles.tableCell}>{level}</Text>
|
||||
<Text style={customStyles.tableCell}>{id}</Text>
|
||||
</View>
|
||||
)
|
||||
)}
|
||||
|
||||
@@ -223,36 +223,27 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
|
||||
|
||||
return data.assignees.map((id) => {
|
||||
const user = users.find((u) => u.id === id);
|
||||
|
||||
if (user) {
|
||||
const exams = flattenResults.filter((e) => e.user === id);
|
||||
return {
|
||||
id,
|
||||
name: user.name,
|
||||
email: user.email,
|
||||
gender: user.demographicInformation?.gender,
|
||||
date:
|
||||
const date =
|
||||
exams.length === 0
|
||||
? "N/A"
|
||||
: new Date(exams[0].date).toLocaleDateString(undefined, {
|
||||
year: "numeric",
|
||||
month: "numeric",
|
||||
day: "numeric",
|
||||
}),
|
||||
result:
|
||||
});
|
||||
const result =
|
||||
exams.length === 0
|
||||
? "N/A"
|
||||
: `${exams[0].score.correct}/${exams[0].score.total}`,
|
||||
};
|
||||
}
|
||||
: `${exams[0].score.correct}/${exams[0].score.total}`;
|
||||
|
||||
return {
|
||||
id: "N/A",
|
||||
name: "N/A",
|
||||
email: "N/A",
|
||||
gender: "N/A",
|
||||
date: "N/A",
|
||||
result: "N/A",
|
||||
id,
|
||||
name: user?.name || "N/A",
|
||||
email: user?.email || "N/A",
|
||||
gender: user?.demographicInformation?.gender || "N/A",
|
||||
date,
|
||||
result,
|
||||
};
|
||||
});
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user