X-Git-Url: https://git.auder.net/?p=qomet.git;a=blobdiff_plain;f=routes%2Fassessments.js;fp=routes%2Fassessments.js;h=d9f83ea9c22cc8d5b512eff9662aed5e03b85c29;hp=3a91b5a9b2ee0e61c473de578e946aa396f3c6b5;hb=43828378be054cf3604b753e8d9ab24af911188f;hpb=7a7dc732599b358b25b770cfc27036f4b403d1b4 diff --git a/routes/assessments.js b/routes/assessments.js index 3a91b5a..d9f83ea 100644 --- a/routes/assessments.js +++ b/routes/assessments.js @@ -2,7 +2,6 @@ let router = require("express").Router(); const access = require("../utils/access"); const UserModel = require("../models/user"); const AssessmentModel = require("../models/assessment"); -const AssessmentEntity = require("../entities/assessment"); const CourseModel = require("../models/course"); const params = require("../config/parameters"); const validator = require("../public/javascripts/utils/validation"); @@ -68,7 +67,7 @@ router.get("/start/assessment", access.ajax, (req,res) => { maxAge: params.cookieExpire, }); } - res.json(ret); //contains questions+password(or paper if resuming) + res.json(ret); //contains password (or paper if resuming) }); }); }); @@ -119,7 +118,7 @@ router.get("/end/assessment", access.ajax, (req,res) => { if (error.length > 0) return res.json({errmsg:error}); // Destroy pwd, set endTime - AssessmentEntity.endAssessment(ObjectId(aid), number, password, (err,ret) => { + AssessmentModel.endAssessment(ObjectId(aid), number, password, (err,ret) => { access.checkRequest(res,err,ret,"Cannot end assessment", () => { res.clearCookie('password'); res.json({});