From 58855dcfd1dc408df07841c93b28bf129871e2cb Mon Sep 17 00:00:00 2001 From: matt Date: Mon, 18 Apr 2022 13:00:19 +0000 Subject: [PATCH] Replace test data with live TestResult data --- routes/test.js | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/routes/test.js b/routes/test.js index 5bde049..17772fb 100644 --- a/routes/test.js +++ b/routes/test.js @@ -137,10 +137,18 @@ router.all(/test\/(.{36})(\/.*)?/, async (req, res, next) => { next(); }); -router.get('/test/:id', (req, res) => { +router.get('/test/:id', async (req, res) => { const t = req.test; const linkRoot = `/admin/test/${t.id}`; + let results = await t.getTestResults(); + + if (req.session.userType === 'student') { + results = results.filter(r => + r.student.id === req.session.userId + ); + } + return res.render('test', { title: `Stratos - ${t.template.name}`, current: 'Tests', @@ -152,13 +160,7 @@ router.get('/test/:id', (req, res) => { reportsLink: `${linkRoot}/reports`, deleteLink: `${linkRoot}/delete`, userType: req.session.userType, - testResults: [ { - mark: 50, - percentage: 100, - grade: 'A', - author: t.class.teachers[0].shortName, - time: new Date().toTimeString() - } ], + testResults: results, stats: [ { value: 19,