X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=public%2Fjavascripts%2Fmonitor.js;h=b5a0fe41754222a6d297eb761c495c863b92b492;hb=25cb8d539e4f68586f2e5fa95e20f6de3c031b6f;hp=07a0814395acd56cb31d966882e1468efb939c67;hpb=fa6abf40b7afdbff4b9dc5fb143e29db512bf8c5;p=qomet.git

diff --git a/public/javascripts/monitor.js b/public/javascripts/monitor.js
index 07a0814..b5a0fe4 100644
--- a/public/javascripts/monitor.js
+++ b/public/javascripts/monitor.js
@@ -29,12 +29,7 @@ new Vue({
 			return this.students
 				.filter( s => { return group==0 || s.group == group; })
 				.map( s => { return Object.assign({}, s); }) //not altering initial array
-				.sort( (a,b) => {
-					let res = a.name.localeCompare(b.name);
-					if (res == 0)
-						res += a.forename.localeCompare(b.forename);
-					return res;
-				});
+				.sort( (a,b) => { return a.name.localeCompare(b.name); });
 		},
 		groupList: function() {
 			let maxGrp = 1;
@@ -47,6 +42,23 @@ new Vue({
 		groupId: function(group, prefix) {
 			return (prefix || "") + "group" + group;
 		},
+		togglePresence: function(s) {
+			s.present = !s.present;
+		},
+		allFinished: function() {
+			for (s of this.students)
+			{
+				if (!s.present)
+					continue;
+				const paperIdx = this.assessment.papers.findIndex( item => { return item.number == number; });
+				if (paperIdx === -1)
+					return false;
+				const paper = this.assessment.papers[paperIdx];
+				if (paper.inputs.length < this.assessment.questions.length)
+					return false;
+			}
+			return true;
+		},
 		getColor: function(number, qIdx) {
 			// For the moment, green if correct and red if wrong; grey if unanswered yet
 			// TODO: in-between color for partially right (especially for multi-questions)
@@ -87,10 +99,38 @@ new Vue({
 						return input;
 					});
 					this.students = s.students;
+					this.students.forEach( s => { s.present = true; }); //a priori...
 					this.stage = 1;
 					socket = io.connect("/", {
 						query: "aid=" + this.assessment._id + "&secret=" + s.secret
 					});
+					socket.on(message.studentBlur, m => {
+						const sIdx = this.students.findIndex( item => { return item.number == m.number; });
+						Vue.set(this.students, sIdx, Object.assign({},this.students[sIdx],{blur: true}));
+						//this.students[sIdx].blur = true;
+					});
+					socket.on(message.studentFocus, m => {
+						const sIdx = this.students.findIndex( item => { return item.number == m.number; });
+						this.students[sIdx].blur = false;
+					});
+					socket.on(message.studentResize, m => {
+						const sIdx = this.students.findIndex( item => { return item.number == m.number; });
+						Vue.set(this.students, sIdx, Object.assign({},this.students[sIdx],{resize: true}));
+						//this.students[sIdx].resize = true;
+					});
+					socket.on(message.studentFullscreen, m => {
+						const sIdx = this.students.findIndex( item => { return item.number == m.number; });
+						this.students[sIdx].resize = false;
+					});
+					socket.on(message.studentDisconnect, m => {
+						const sIdx = this.students.findIndex( item => { return item.number == m.number; });
+						Vue.set(this.students, sIdx, Object.assign({},this.students[sIdx],{disco: true}));
+						//this.students[sIdx].disco = true;
+					});
+					socket.on(message.studentConnect, m => {
+						const sIdx = this.students.findIndex( item => { return item.number == m.number; });
+						this.students[sIdx].disco = false;
+					});
 					socket.on(message.newAnswer, m => {
 						let paperIdx = this.assessment.papers.findIndex( item => {
 							return item.number == m.number;
@@ -105,16 +145,17 @@ new Vue({
 							});
 						}
 						// TODO: notations not coherent (input / answer... when, which ?)
-						this.assessment.papers[paperIdx].inputs.push(m.answer); //input+index
+						this.assessment.papers[paperIdx].inputs.push(JSON.parse(m.answer)); //input+index
 					});
 				},
 			});
 		},
 		endMonitoring: function() {
 			// In the end, send answers to students
+			// TODO: disable this button until everyone finished (need ability to mark absents)
 			socket.emit(
 				message.allAnswers,
-				{ answers: this.assessment.questions.map( q => { return q.answer; }) }
+				{ answers: JSON.stringify(this.assessment.questions.map( q => { return q.answer; })) }
 			);
 		},
 	},