From 1cd4dfc3972be9343eabad75161ab15c761ce54a Mon Sep 17 00:00:00 2001 From: Joao Ramos Date: Tue, 20 Aug 2024 01:15:43 +0100 Subject: [PATCH] Added download option to master Corporate and teacher --- src/dashboards/MasterCorporate.tsx | 2 ++ src/dashboards/Teacher.tsx | 2 ++ src/pages/api/assignments/[id]/[export]/excel.ts | 12 ++---------- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/dashboards/MasterCorporate.tsx b/src/dashboards/MasterCorporate.tsx index 03b8c840..6c25f391 100644 --- a/src/dashboards/MasterCorporate.tsx +++ b/src/dashboards/MasterCorporate.tsx @@ -614,6 +614,7 @@ export default function MasterCorporateDashboard({user}: Props) { allowDownload reload={reloadAssignments} allowArchive + allowExcelDownload /> ))} @@ -630,6 +631,7 @@ export default function MasterCorporateDashboard({user}: Props) { allowDownload reload={reloadAssignments} allowUnarchive + allowExcelDownload /> ))} diff --git a/src/dashboards/Teacher.tsx b/src/dashboards/Teacher.tsx index 243df376..e1ddbbb5 100644 --- a/src/dashboards/Teacher.tsx +++ b/src/dashboards/Teacher.tsx @@ -260,6 +260,7 @@ export default function TeacherDashboard({user}: Props) { allowDownload reload={reloadAssignments} allowArchive + allowExcelDownload /> ))} @@ -276,6 +277,7 @@ export default function TeacherDashboard({user}: Props) { allowDownload reload={reloadAssignments} allowUnarchive + allowExcelDownload /> ))} diff --git a/src/pages/api/assignments/[id]/[export]/excel.ts b/src/pages/api/assignments/[id]/[export]/excel.ts index bd7da652..20661676 100644 --- a/src/pages/api/assignments/[id]/[export]/excel.ts +++ b/src/pages/api/assignments/[id]/[export]/excel.ts @@ -182,8 +182,6 @@ async function post(req: NextApiRequest, res: NextApiResponse) { worksheet.getCell(`B${index + 1}`).value = value; // Second column (values) }); - logWorksheetData(worksheet); - // Define the static part of the headers (before "Test Sections") const staticHeaders = [ "Sr N", @@ -216,8 +214,6 @@ async function post(req: NextApiRequest, res: NextApiResponse) { // 1 headers rows const startIndexTable = firstSectionData.length + 1; - logWorksheetData(worksheet); - // // Merge "Test Sections" over dynamic number of columns // const tableColumns = staticHeaders.length + numberOfTestSections; worksheet.mergeCells( @@ -227,10 +223,6 @@ async function post(req: NextApiRequest, res: NextApiResponse) { tableColumnHeadersFirstPart.length ); - // logWorksheetData(worksheet); - // worksheet.mergeCells(`G1:G3`); // Time Spent - // worksheet.mergeCells(`H1:H3`); // Score - // worksheet.mergeCells(`I1:I3`); // Level // Add the dynamic second and third header rows for test sections and sub-columns worksheet.addRow([ @@ -277,10 +269,10 @@ async function post(req: NextApiRequest, res: NextApiResponse) { return `${score.correct}/${score.total}`; }), `${ - data.stats.reduce( + Math.ceil(data.stats.reduce( (acc: number, curr: any) => acc + curr.timeSpent, 0 - ) / 60 + ) / 60) } minutes`, data.correct, ]);