X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=public%2Fjavascripts%2Fassessment.js;h=ec56309e7aaf8aeb40283ee7418785ecfdeb5a10;hb=43828378be054cf3604b753e8d9ab24af911188f;hp=09caf12aa37e6d2106759c43769ffb87f71e4c9c;hpb=71d1ca9c594b64d959c608a2abbff926480abad5;p=qomet.git

diff --git a/public/javascripts/assessment.js b/public/javascripts/assessment.js
index 09caf12..ec56309 100644
--- a/public/javascripts/assessment.js
+++ b/public/javascripts/assessment.js
@@ -12,7 +12,7 @@ function checkWindowSize()
 	return window.innerWidth >= screen.width-3 && window.innerHeight >= screen.height-3;
 };
 
-let V = new Vue({
+new Vue({
 	el: "#assessment",
 	data: {
 		assessment: assessment,
@@ -39,25 +39,53 @@ let V = new Vue({
 	},
 	mounted: function() {
 		$(".modal").modal();
-		if (assessment.mode != "secure")
-			return;
-		window.addEventListener("keydown", e => {
-			// Ignore F12 (avoid accidental window resize due to devtools)
-			// NOTE: in Chromium at least, fullscreen mode exit with F11 cannot be prevented.
-			// Workaround: disable key at higher level. Possible xbindkey config:
-			// "false"
-			//   m:0x10 + c:95
-			//   Mod2 + F11
-			if (e.keyCode == 123)
-				e.preventDefault();
-		}, false);
+		if (assessment.mode != "open")
+		{
+			window.addEventListener("keydown", e => {
+				// Ignore F12 (avoid accidental window resize due to devtools)
+				// NOTE: in Chromium at least, fullscreen mode exit with F11 cannot be prevented.
+				// Workaround: disable key at higher level. Possible xbindkey config:
+				// "false"
+				//   m:0x10 + c:95
+				//   Mod2 + F11
+				if (e.keyCode == 123)
+					e.preventDefault();
+			}, false);
+		}
 		window.addEventListener("blur", () => {
-			this.trySendCurrentAnswer();
-			document.location.href= "/noblur";
+			if (!socket)
+				return;
+			if (assessment.mode == "secure")
+			{
+				this.trySendCurrentAnswer();
+				document.location.href= "/noblur";
+			}
+			else if (assessment.mode == "exam")
+				socket.emit(message.studentBlur, {number:this.student.number});
 		}, false);
+		if (assessment.mode == "exam")
+		{
+			window.addEventListener("focus", () => {
+				if (!socket)
+					return;
+				socket.emit(message.studentFocus, {number:this.student.number});
+			}, false);
+		}
 		window.addEventListener("resize", e => {
-			this.trySendCurrentAnswer();
-			document.location.href= "/fullscreen";
+			if (!socket)
+				return;
+			if (assessment.mode == "secure")
+			{
+				this.trySendCurrentAnswer();
+				document.location.href= "/fullscreen";
+			}
+			else if (assessment.mode == "exam")
+			{
+				if (checkWindowSize())
+					socket.emit(message.studentFullscreen, {number:this.student.number});
+				else
+					socket.emit(message.studentResize, {number:this.student.number});
+			}
 		}, false);
 	},
 	methods: {
@@ -105,6 +133,9 @@ let V = new Vue({
 				$("#leftButton, #rightButton").hide();
 				if (assessment.time > 0)
 				{
+
+// TODO: distinguish total exam time AND question time
+
 					const deltaTime = !!paper ? Date.now() - paper.startTime : 0;
 					this.remainingTime = assessment.time * 60 - Math.round(deltaTime / 1000);
 					this.runTimer();
@@ -129,7 +160,8 @@ let V = new Vue({
 					this.answers.indices = indices.concat( _.shuffle(remainingIndices) );
 				}
 				this.answers.index = !!paper ? paper.inputs.length : 0;
-				Vue.nextTick(statementsLibsRefresh);
+				this.answers.displayAll = assessment.display == "all";
+				this.answers.showSolution = false;
 				this.stage = 2;
 			};
 			if (assessment.mode == "open")
@@ -156,7 +188,7 @@ let V = new Vue({
 						// Got password: students answers locked to this page until potential teacher
 						// action (power failure, computer down, ...)
 					}
-					socket = io.connect("/" + assessment.name, {
+					socket = io.connect("/", {
 						query: "aid=" + assessment._id + "&number=" + this.student.number + "&password=" + this.student.password
 					});
 					socket.on(message.allAnswers, this.setAnswers);
@@ -180,7 +212,7 @@ let V = new Vue({
 			}, 1000);
 		},
 		// stage 2
-		sendAnswer: function() {
+		sendOneAnswer: function() {
 			const realIndex = this.answers.indices[this.answers.index];
 			let gotoNext = () => {
 				if (this.answers.index == assessment.questions.length - 1)
@@ -215,6 +247,13 @@ let V = new Vue({
 				},
 			});
 		},
+		// TODO: I don't like that + sending should not be definitive in exam mode with display = all
+		sendAnswer: function() {
+			if (assessment.display == "one")
+				this.sendOneAnswer();
+			else
+				assessment.questions.forEach(this.sendOneAnswer);
+		},
 		// stage 2 --> 3 (or 4)
 		// from a message by statements component, or time over
 		endAssessment: function() {
@@ -223,6 +262,8 @@ let V = new Vue({
 			if (assessment.mode == "open")
 			{
 				this.stage = 4;
+				this.answers.showSolution = true;
+				this.answers.displayAll = true;
 				return;
 			}
 			$.ajax("/end/assessment", {
@@ -236,19 +277,21 @@ let V = new Vue({
 				success: ret => {
 					if (!!ret.errmsg)
 						return this.showWarning(ret.errmsg);
-					assessment.conclusion = ret.conclusion;
 					this.stage = 3;
 					delete this.student["password"]; //unable to send new answers now
-					socket.disconnect();
-					socket = null;
 				},
 			});
 		},
 		// stage 3 --> 4 (on socket message "feedback")
 		setAnswers: function(m) {
-			for (let i=0; i<m.answers.length; i++)
-				assessment.questions[i].answer = m.answers[i];
+			const answers = JSON.parse(m.answers);
+			for (let i=0; i<answers.length; i++)
+				assessment.questions[i].answer = answers[i];
+			this.answers.showSolution = true;
+			this.answers.displayAll = true;
 			this.stage = 4;
+			socket.disconnect();
+			socket = null;
 		},
 	},
 });