From 4163076524ec6831a30e69a70f4b30ae6004c26b Mon Sep 17 00:00:00 2001 From: Joao Ramos Date: Sat, 27 Jan 2024 19:27:28 +0000 Subject: [PATCH] Added passportid to the table ; removed gender column from table --- src/exams/pdf/group.test.report.tsx | 19 +++++++++++++++---- src/interfaces/module.scores.ts | 1 + src/pages/api/assignments/[id]/export.tsx | 3 +++ 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/exams/pdf/group.test.report.tsx b/src/exams/pdf/group.test.report.tsx index 4fa67f28..633aa56f 100644 --- a/src/exams/pdf/group.test.report.tsx +++ b/src/exams/pdf/group.test.report.tsx @@ -250,7 +250,19 @@ const GroupTestReport = ({ {showLevel && Level} {studentsData.map( - ({ id, name, email, gender, date, result, level }, index) => ( + ( + { + id, + name, + email, + gender, + date, + result, + level, + passportId: studentPassportId, + }, + index + ) => ( {name} {email} - - {gender} - + {studentPassportId} + {date} diff --git a/src/interfaces/module.scores.ts b/src/interfaces/module.scores.ts index d52d51c4..144ed6aa 100644 --- a/src/interfaces/module.scores.ts +++ b/src/interfaces/module.scores.ts @@ -19,4 +19,5 @@ export interface StudentData { result: string; level?: string; bandScore: number; + passportId?: string; } diff --git a/src/pages/api/assignments/[id]/export.tsx b/src/pages/api/assignments/[id]/export.tsx index 7ccf0e83..5d8a3397 100644 --- a/src/pages/api/assignments/[id]/export.tsx +++ b/src/pages/api/assignments/[id]/export.tsx @@ -235,6 +235,8 @@ async function post(req: NextApiRequest, res: NextApiResponse) { const result = exams.length === 0 ? "N/A" : `${correct}/${total}`; + const userDemographicInformation = user?.demographicInformation as DemographicInformation; + return { id, name: user?.name || "N/A", @@ -244,6 +246,7 @@ async function post(req: NextApiRequest, res: NextApiResponse) { result, level: showLevel ? getLevelScoreForUserExams(bandScore) : undefined, bandScore, + passportId: userDemographicInformation?.passport_id || "" }; }); };