Merged in bug-fixing-27-jan-24 (pull request #28)

Bug fixing 27 jan 24

src/exams/pdf/group.test.report.tsx

@@ -112,11 +112,6 @@ const GroupTestReport = ({
           Candidate Information:
         </Text>
         <View style={styles.textMargin}>
-          <Text style={defaultTextStyle}>Name: {name}</Text>
-          <Text style={defaultTextStyle}>ID: {id}</Text>
-          <Text style={defaultTextStyle}>Email: {email}</Text>
-          <Text style={defaultTextStyle}>Gender: {gender}</Text>
-          <Text style={defaultTextStyle}>Passport ID: {passportId}</Text>
           <Text style={defaultTextStyle}>
             Total Number of Students: {numberOfStudents}
           </Text>
@@ -242,10 +237,10 @@ const GroupTestReport = ({
               Sr
             </Text>
             <Text style={customStyles.tableCell}>Candidate Name</Text>
-            <Text style={customStyles.tableCell}>Email ID</Text>
-            <Text style={[customStyles.tableCell, { maxWidth: "48px" }]}>
-              Gender
+            <Text style={customStyles.tableCell}>
+              Passport ID
             </Text>
+            <Text style={customStyles.tableCell}>Email ID</Text>
             <Text style={[customStyles.tableCell, { maxWidth: "64px" }]}>
               Date of test
             </Text>
@@ -255,7 +250,19 @@ const GroupTestReport = ({
             {showLevel && <Text style={customStyles.tableCell}>Level</Text>}
           </View>
           {studentsData.map(
-            ({ id, name, email, gender, date, result, level }, index) => (
+            (
+              {
+                id,
+                name,
+                email,
+                gender,
+                date,
+                result,
+                level,
+                passportId: studentPassportId,
+              },
+              index
+            ) => (
               <View
                 style={[
                   customStyles.tableRow,
@@ -273,10 +280,8 @@ const GroupTestReport = ({
                   {index + 1}
                 </Text>
                 <Text style={customStyles.tableCell}>{name}</Text>
+                <Text style={customStyles.tableCell}>{studentPassportId}</Text>
                 <Text style={customStyles.tableCell}>{email}</Text>
-                <Text style={[customStyles.tableCell, { maxWidth: "48px" }]}>
-                  {gender}
-                </Text>
                 <Text style={[customStyles.tableCell, { maxWidth: "64px" }]}>
                   {date}
                 </Text>

src/exams/pdf/test.report.footer.tsx

@@ -2,7 +2,11 @@ import React from "react";
 import { styles } from "./styles";
 import { View, Text } from "@react-pdf/renderer";
 
-const TestReportFooter = () => (
+interface Props {
+  userId?: string;
+}
+
+const TestReportFooter = ({ userId }: Props) => (
   <View
     style={[
       {
@@ -25,10 +29,23 @@ const TestReportFooter = () => (
         </Text>
       </View>
       <View>
-        <Text style={styles.textBold}>Confidential – <Text style={[styles.textFont, styles.textNormal]}>circulated for concern people</Text></Text>
+        <Text style={styles.textBold}>
+          Confidential –{" "}
+          <Text style={[styles.textFont, styles.textNormal]}>
+            circulated for concern people
+          </Text>
+        </Text>
       </View>
     </View>
-    <View style={{ paddingTop: 10 }}>
+    {userId && (
+      <View>
+        <Text style={styles.textBold}>
+          User ID:{" "}
+          <Text style={[styles.textFont, styles.textNormal]}>{userId}</Text>
+        </Text>
+      </View>
+    )}
+    <View style={{ paddingTop: 4 }}>
       <Text style={styles.textBold}>Declaration</Text>
       <Text style={{ paddingTop: 5 }}>
         We hereby declare that exam results on our platform, assessed by AI, are

src/exams/pdf/test.report.tsx

@@ -124,7 +124,7 @@ const TestReport = ({
           </View>
         </View>
         <View style={[{ paddingTop: 30 }, styles.separator]}></View>
-        <TestReportFooter />
+        <TestReportFooter userId={id}/>
       </Page>
       <Page style={styles.body}>
         <View>
@@ -165,7 +165,7 @@ const TestReport = ({
         </View>
         <View style={[{ paddingBottom: 30 }, styles.separator]}></View>
         <View style={{ flexGrow: 1 }}></View>
-        <TestReportFooter />
+        <TestReportFooter userId={id}/>
       </Page>
     </Document>
   );

src/interfaces/module.scores.ts

@@ -19,4 +19,5 @@ export interface StudentData {
 	result: string;
 	level?: string;
 	bandScore: number;
+	passportId?: string;
 }

src/pages/action.tsx

@@ -26,7 +26,7 @@ export function getServerSideProps({query, res}: {query: {oobCode: string; mode:
 			code: query.oobCode,
 			mode: query.mode,
 			apiKey: query.apiKey,
-			continueUrl: query.continueUrl,
+			...query.continueUrl ? { continueUrl: query.continueUrl } : {},
 		},
 	};
 }

src/pages/api/assignments/[id]/export.tsx

@@ -113,10 +113,6 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
 			return;
 		}
 
-		if (data.assigner !== req.session.user.id) {
-			res.status(401).json({ok: false});
-			return;
-		}
 		if (data.pdf) {
 			// if it does, return the pdf url
 			const fileRef = ref(storage, data.pdf);
@@ -239,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",
@@ -248,6 +246,7 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
 							result,
 							level: showLevel ? getLevelScoreForUserExams(bandScore) : undefined,
 							bandScore,
+							passportId: userDemographicInformation?.passport_id || ""
 						};
 					});
 				};

src/pages/api/stats/[id]/export.tsx

@@ -126,6 +126,15 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
 		const stats = docsSnap.docs.map((d) => d.data());
 		// verify if the stats already have a pdf generated
 		const hasPDF = stats.find((s) => s.pdf);
+		// find the user that generated the stats
+		const statIndex = stats.findIndex((s) => s.user);
+
+		if(statIndex === -1) {
+			res.status(401).json({ok: false});
+			return;
+		}
+		const userId = stats[statIndex].user;
+		
 
 		if (hasPDF) {
 			// if it does, return the pdf url
@@ -138,7 +147,7 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
 
 		try {
 			// generate the pdf report
-			const docUser = await getDoc(doc(db, "users", req.session.user.id));
+			const docUser = await getDoc(doc(db, "users", userId));
 
 			if (docUser.exists()) {
 				// we'll need the user in order to get the user data (name, email, focus, etc);
@@ -269,7 +278,7 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
 							.format("ll HH:mm:ss")}
 						name={user.name}
 						email={user.email}
-						id={user.id}
+						id={userId}
 						gender={demographicInformation?.gender}
 						summary={performanceSummary}
 						testDetails={testDetails}