X-Git-Url: https://git.auder.net/assets/icon_infos.svg?a=blobdiff_plain;ds=sidebyside;f=routes%2Fassessments.js;h=03e483e1dcb70935f225fe99f0c38b1962ddd131;hb=73609d3bc662cf4c8a21746c5d1ad736ea0eecbd;hp=a107d7e15e017a7a439646ff306853b88b61349f;hpb=71d1ca9c594b64d959c608a2abbff926480abad5;p=qomet.git

diff --git a/routes/assessments.js b/routes/assessments.js
index a107d7e..03e483e 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");
@@ -11,15 +10,16 @@ const sanitizeHtml = require('sanitize-html');
 const sanitizeOpts = {
 	allowedTags: sanitizeHtml.defaults.allowedTags.concat([ 'img', 'u' ]),
 	allowedAttributes: {
-		img: [ 'src' ],
+		img: [ 'src','style' ],
 		code: [ 'class' ],
 		table: [ 'class' ],
+		div: [ 'style' ],
 	},
 };
 
-router.get("/add/assessment", access.ajax, access.logged, (req,res) => {
-	const name = req.query["name"];
-	const cid = req.query["cid"];
+router.post("/assessments", access.ajax, access.logged, (req,res) => {
+	const name = req.body["name"];
+	const cid = req.body["cid"];
 	let error = validator({cid:cid, name:name}, "Assessment");
 	if (error.length > 0)
 		return res.json({errmsg:error});
@@ -30,13 +30,12 @@ router.get("/add/assessment", access.ajax, access.logged, (req,res) => {
 	});
 });
 
-router.post("/update/assessment", access.ajax, access.logged, (req,res) => {
+router.put("/assessments", access.ajax, access.logged, (req,res) => {
 	const assessment = JSON.parse(req.body["assessment"]);
 	let error = validator(assessment, "Assessment");
 	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?!)
@@ -51,9 +50,9 @@ router.post("/update/assessment", access.ajax, access.logged, (req,res) => {
 });
 
 // Generate and set student password, return it
-router.get("/start/assessment", access.ajax, (req,res) => {
-	let number = req.query["number"];
-	let aid = req.query["aid"];
+router.put("/assessments/start", access.ajax, (req,res) => {
+	let number = req.body["number"];
+	let aid = req.body["aid"];
 	let password = req.cookies["password"]; //potentially from cookies, resuming
 	let error = validator({ _id:aid, papers:[{number:number,password:password || "samplePwd"}] }, "Assessment");
 	if (error.length > 0)
@@ -68,12 +67,12 @@ 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)
 		});
 	});
 });
 
-router.get("/start/monitoring", access.ajax, (req,res) => {
+router.get("/assessments/monitor", access.ajax, (req,res) => {
 	const password = req.query["password"];
 	const examName = req.query["aname"];
 	const courseCode = req.query["ccode"];
@@ -96,11 +95,11 @@ router.get("/start/monitoring", access.ajax, (req,res) => {
 	});
 });
 
-router.get("/send/answer", access.ajax, (req,res) => {
-	let aid = req.query["aid"];
-	let number = req.query["number"];
-	let password = req.query["password"];
-	let input = JSON.parse(req.query["answer"]);
+router.put("/assessments/answer", access.ajax, (req,res) => {
+	let aid = req.body["aid"];
+	let number = req.body["number"];
+	let password = req.body["password"];
+	let input = JSON.parse(req.body["answer"]);
 	let error = validator({ _id:aid, papers:[{number:number,password:password,inputs:[input]}] }, "Assessment");
 	if (error.length > 0)
 		return res.json({errmsg:error});
@@ -111,18 +110,18 @@ router.get("/send/answer", access.ajax, (req,res) => {
 	});
 });
 
-router.get("/end/assessment", access.ajax, (req,res) => {
-	let aid = req.query["aid"];
-	let number = req.query["number"];
-	let password = req.query["password"];
+router.put("/assessments/end", access.ajax, (req,res) => {
+	let aid = req.body["aid"];
+	let number = req.body["number"];
+	let password = req.body["password"];
 	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({});
 		});
 	});
 });