diff --git a/routes/admin.js b/routes/admin.js index e0729ce..41db4b0 100644 --- a/routes/admin.js +++ b/routes/admin.js @@ -49,7 +49,7 @@ router.get('/dashboard', async (req, res) => { }); }); -router.get(/user\/(.{36})(\/.*)?/, async (req, res, next) => { +router.all(/user\/(.{36})(\/.*)?/, async (req, res, next) => { let u; try { u = await new User(null, req.params[0]); diff --git a/routes/class.js b/routes/class.js index 501f3fa..376b179 100644 --- a/routes/class.js +++ b/routes/class.js @@ -56,7 +56,7 @@ router.post('/class/add', async (req, res) => { res.redirect(`/admin/class/${c.id}/members`); }); -router.get(/class\/(.{36})(\/.*)?/, async (req, res, next) => { +router.all(/class\/(.{36})(\/.*)?/, async (req, res, next) => { let c; try { c = await new Class(req.params[0]); diff --git a/routes/test.js b/routes/test.js index d09c145..2ac4aee 100644 --- a/routes/test.js +++ b/routes/test.js @@ -107,7 +107,7 @@ router.post('/testTemplate/add', async (req, res) => { return res.redirect('/admin/test/add'); }); -router.get(/test\/(.{36})(\/.*)?/, async (req, res, next) => { +router.all(/test\/(.{36})(\/.*)?/, async (req, res, next) => { let t; try { t = await new Test(req.params[0]); @@ -126,6 +126,7 @@ router.get(/test\/(.{36})(\/.*)?/, async (req, res, next) => { next(); }); + router.get('/test/:id', async (req, res) => { const t = await new Test(req.params.id); const linkRoot = `/admin/test/${t.id}`; @@ -140,6 +141,7 @@ router.get('/test/:id', async (req, res) => { maxMark: t.template.maxMark, reportsLink: `${linkRoot}/reports`, deleteLink: `${linkRoot}/delete`, + userType: req.session.userType, testResults: [ { mark: 50, percentage: 100,