X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=public%2Fjavascripts%2Fmonitor.js;h=1b8d62f9f8573343c07714d82187d878d56d9972;hb=2bada710d28ffe9f45b150e5744b43af83e93d99;hp=23972a946f6f09b0c381b488214cc3b39e130aae;hpb=29c8b391bcdf6ffca53545178e2ad194287a1bdc;p=qomet.git

diff --git a/public/javascripts/monitor.js b/public/javascripts/monitor.js
index 23972a9..1b8d62f 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;
@@ -91,6 +86,33 @@ new Vue({
 					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;
@@ -112,6 +134,7 @@ new Vue({
 		},
 		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: JSON.stringify(this.assessment.questions.map( q => { return q.answer; })) }