matt/stratos
1
0
Fork 0
mirror of https://github.com/matt-fidd/stratos.git synced 2026-01-01 20:59:30 +00:00
Code Issues Projects Releases Wiki Activity

Make test and class validation more general

Browse Source
This commit is contained in:
matt
2022-03-14 09:42:33 +00:00
parent e1de67266c
commit 0298c81f51
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
routes/class.js
View File

@@ -56,10 +56,10 @@ router.post('/class/add', async (req, res) => {
res.redirect(`/admin/class/${c.id}/members`); res.redirect(`/admin/class/${c.id}/members`);
}); });
router.get('/class/:id', async (req, res) => { router.get(/class\/(.{36})(\/.*)?/, async (req, res, next) => {
let c; let c;
try { try {
c = await new Class(req.params.id); c = await new Class(req.params[0]);
} catch (e) { } catch (e) {
return res.status(400).render('error', { return res.status(400).render('error', {
title: 'Stratos - Error', title: 'Stratos - Error',
@@ -73,7 +73,12 @@ router.get('/class/:id', async (req, res) => {
if (!await c.hasAccess(await new User(null, req.session.userId))) if (!await c.hasAccess(await new User(null, req.session.userId)))
return res.redirect('/admin/classes'); return res.redirect('/admin/classes');
const linkRoot = `/class/${c.id}`; next();
});
router.get('/class/:id', async (req, res) => {
const c = await new Class(req.params.id);
const linkRoot = `/admin/class/${c.id}`;
const upcomingTests = await c.getTests({ range: 'after' }); const upcomingTests = await c.getTests({ range: 'after' });
const recentTests = await c.getTests({ range: 'before' }); const recentTests = await c.getTests({ range: 'before' });
const testCount = recentTests.length + upcomingTests.length; const testCount = recentTests.length + upcomingTests.length;
@@ -90,6 +95,8 @@ router.get('/class/:id', async (req, res) => {
contactLink: `${linkRoot}/contact`, contactLink: `${linkRoot}/contact`,
testsLink: `${linkRoot}/tests`, testsLink: `${linkRoot}/tests`,
reportsLink: `${linkRoot}/reports`, reportsLink: `${linkRoot}/reports`,
deleteLink: `${linkRoot}/delete`,
userType: req.session.userType,
stats: [ stats: [
{ {
value: testCount, value: testCount,

8
routes/test.js
View File

@@ -98,10 +98,10 @@ router.post('/testTemplate/add', async (req, res) => {
return res.json(tt); return res.json(tt);
}); });
router.get('/test/:id', async (req, res) => { router.get(/test\/(.{36})(\/.*)?/, async (req, res, next) => {
let t; let t;
try { try {
t = await new Test(req.params.id); t = await new Test(req.params[0]);
} catch (e) { } catch (e) {
return res.status(400).render('error', { return res.status(400).render('error', {
title: 'Stratos - Error', title: 'Stratos - Error',
@@ -115,6 +115,10 @@ router.get('/test/:id', async (req, res) => {
if (!await t.hasAccess(await new User(null, req.session.userId))) if (!await t.hasAccess(await new User(null, req.session.userId)))
return res.redirect('/admin/tests'); return res.redirect('/admin/tests');
next();
});
router.get('/test/:id', async (req, res) => {
const t = await new Test(req.params.id);
const linkRoot = `/test/${t.id}`; const linkRoot = `/test/${t.id}`;
return res.render('test', { return res.render('test', {