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");
if (error.length > 0)
return res.json({errmsg:error});
assessment.introduction = sanitizeHtml(assessment.introduction, sanitizeOpts);
- assessment.conclusion = sanitizeHtml(assessment.conclusion, sanitizeOpts);
assessment.questions.forEach( q => {
q.wording = sanitizeHtml(q.wording, sanitizeOpts);
//q.answer = sanitizeHtml(q.answer); //if text (TODO: it's an array in this case?!)
maxAge: params.cookieExpire,
});
}
- res.json(ret); //contains questions+password(or paper if resuming)
+ res.json(ret); //contains password (or paper if resuming)
});
});
});
let error = validator({ _id:aid, papers:[{number:number,password:password}] }, "Assessment");
if (error.length > 0)
return res.json({errmsg:error});
- // Destroy pwd, set endTime, return conclusion
- AssessmentModel.endSession(ObjectId(aid), number, password, (err,conclusion) => {
- access.checkRequest(res,err,conclusion,"Cannot end assessment", () => {
+ // Destroy pwd, set endTime
+ AssessmentModel.endAssessment(ObjectId(aid), number, password, (err,ret) => {
+ access.checkRequest(res,err,ret,"Cannot end assessment", () => {
res.clearCookie('password');
- res.json(conclusion);
+ res.json({});
});
});
});