From 6c741f944d1572b279649200546f5e2b89ce30f7 Mon Sep 17 00:00:00 2001
From: Joao Ramos <joaomframos.1@gmail.com>
Date: Tue, 9 Jan 2024 21:32:07 +0000
Subject: [PATCH] Minor improvements on labels

---
 src/exams/pdf/group.test.report.tsx       | 15 ++-------------
 src/pages/api/assignments/[id]/export.tsx |  5 +++--
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/exams/pdf/group.test.report.tsx b/src/exams/pdf/group.test.report.tsx
index c7fa48b9..e4d94c99 100644
--- a/src/exams/pdf/group.test.report.tsx
+++ b/src/exams/pdf/group.test.report.tsx
@@ -203,10 +203,10 @@ const GroupTestReport = ({
                   ]}
                   key={label}
                 >
-                  <Text style={[customStyles.tableCell, { maxWidth: "48px" }]}>
+                  <Text style={customStyles.tableCell}>
                     {label}
                   </Text>
-                  <View style={customStyles.tableCell}>
+                  <View style={[customStyles.tableCell, { flex: 2}]}>
                     <ProgressBar
                       width={200}
                       height={18}
@@ -228,17 +228,6 @@ const GroupTestReport = ({
           </View>
         </View>
         <View style={[{ paddingBottom: 30 }, styles.separator]}></View>
-        {false && (
-          <View>
-            <ProgressBar
-              width={200}
-              height={18}
-              backgroundColor="#cc5b55"
-              progressColor="#fab7b0"
-              percentage={60}
-            />
-          </View>
-        )}
         <View style={{ flexGrow: 1 }}></View>
         <TestReportFooter />
       </Page>
diff --git a/src/pages/api/assignments/[id]/export.tsx b/src/pages/api/assignments/[id]/export.tsx
index d78fbaf3..380cd846 100644
--- a/src/pages/api/assignments/[id]/export.tsx
+++ b/src/pages/api/assignments/[id]/export.tsx
@@ -327,9 +327,10 @@ async function post(req: NextApiRequest, res: NextApiResponse) {
             []
           ) as GroupScoreSummaryHelper[];
 
-          const result = resultHelper.map(({ label, sessions }) => {
+          const result = resultHelper.map(({ score, label, sessions }) => {
+            const finalLabel = showLevel ? getLevelScore(score[0])[1] : label;
             return {
-              label,
+              label: finalLabel,
               percent: Math.floor((sessions.length / numberOfStudents) * 100),
               description: `No. Candidates ${sessions.length} of ${numberOfStudents}`,
             };