X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=models%2Fassessment.js;h=9269aeedcf8e7ec4d003e2974e90df2b3a3ec5a4;hb=2c545c26b465fe40dc308c321a11f5515cebc4c7;hp=3f89cc9d401bfb1f0c25a308536013cabbece3a9;hpb=e99c53fb3be56eb4c685dd061eef0e5b5bf22b73;p=qomet.git

diff --git a/models/assessment.js b/models/assessment.js
index 3f89cc9..9269aee 100644
--- a/models/assessment.js
+++ b/models/assessment.js
@@ -57,19 +57,50 @@ const AssessmentModel =
 	},
 
 	// Set password in responses collection
-	startSession: function(aid, number, cb)
+	startSession: function(aid, number, password, cb)
 	{
-		const password = TokenGen.generate(12); //arbitrary number, 12 seems enough...
-		AssessmentEntity.getQuestions(aid, (err,questions) => {
-			AssessmentEntity.startSession(aid, number, password, (err2,ret) => {
-				cb(err, {
-					questions: questions,
-					password: password,
+		AssessmentEntity.getPaperByNumber(aid, number, (err,paper) => {
+			if (!!err)
+				return cb(err,null);
+			if (!!paper)
+			{
+				if (!password)
+					return cb({errmsg:"Missing password"});
+				if (paper.password != password)
+					return cb({errmsg:"Wrong password"});
+			}
+			AssessmentEntity.getQuestions(aid, (err,questions) => {
+				if (!!err)
+					return cb(err,null);
+				if (!!paper)
+					return cb(null,{paper:paper,questions:questions});
+				const pwd = TokenGen.generate(12); //arbitrary number, 12 seems enough...
+				AssessmentEntity.startSession(aid, number, pwd, (err2,ret) => {
+					cb(err2, {
+						questions: questions,
+						password: pwd,
+					});
 				});
 			});
 		});
 	},
 
+	newAnswer: function(aid, number, password, input, cb)
+	{
+		// Check that student hasn't already answered
+		AssessmentEntity.hasInput(aid, number, password, input.index, (err,ret) => {
+			if (!!err)
+				return cb(err,null);
+			if (!!ret)
+				return cb({errmsg:"Question already answered"},null);
+			AssessmentEntity.setInput(aid, number, password, input, (err2,ret2) => {
+				if (!!err2 || !ret2)
+					return cb(err2,ret2);
+				return cb(null,ret2);
+			});
+		});
+	},
+
 	endSession: function(aid, number, password, cb)
 	{
 		AssessmentEntity.endAssessment(aid, number, password, (err,ret) => {