X-Git-Url: https://git.auder.net/?p=qomet.git;a=blobdiff_plain;f=public%2Fjavascripts%2Fmonitor.js;h=6c08d7a05b2f417ec231e4a21f41e38a2d3f31b9;hp=5d5f237c44db3fd38218dc81f32f24281a87b9da;hb=71d1ca9c594b64d959c608a2abbff926480abad5;hpb=f6648c37a3c13efbbc3b8c03c6ff725984c98843

diff --git a/public/javascripts/monitor.js b/public/javascripts/monitor.js
index 5d5f237..6c08d7a 100644
--- a/public/javascripts/monitor.js
+++ b/public/javascripts/monitor.js
@@ -1,18 +1,10 @@
-// TODO: onglets pour chaque groupe + section déroulante questionnaire (chargé avec réponses)
-//   NOM Prenom (par grp, puis alphabétique)
-//   réponse : vert si OK (+ choix), rouge si faux, gris si texte (clic pour voir)
-//   + temps total ?
-//   click sur en-tête de colonne : tri alphabétique, tri décroissant...
-// Affiché si (hash du) mdp du cours est correctement entré
-// Doit reprendre les données en base si refresh (sinon : sockets)
-
 let socket = null; //monitor answers in real time
 
 new Vue({
 	el: "#monitor",
 	data: {
 		password: "", //from password field
-		assessment: null, //obtained after authentication
+		assessment: { }, //obtained after authentication
 		// Stage 0: unauthenticated (password),
 		//       1: authenticated (password hash validated), start monitoring
 		stage: 0,
@@ -22,23 +14,75 @@ new Vue({
 			inputs: [ ],
 			index : -1,
 		},
+		students: [ ], //to know their names
+		display: "assessment", //or student's answers
 	},
 	methods: {
+		// TODO: redundant code, next 4 funcs already exist in course.js
+		toggleDisplay: function(area) {
+			if (this.display == area)
+				this.display = "";
+			else
+				this.display = area;
+		},
+		studentList: function(group) {
+			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;
+				});
+		},
+		groupList: function() {
+			let maxGrp = 1;
+			this.students.forEach( s => {
+				if (s.group > maxGrp)
+					maxGrp = s.group;
+			});
+			return _.range(1,maxGrp+1);
+		},
+		groupId: function(group, prefix) {
+			return (prefix || "") + "group" + group;
+		},
+		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)
+			const paperIdx = this.assessment.papers.findIndex( item => { return item.number == number; });
+			if (paperIdx === -1)
+				return "grey"; //student didn't start yet
+			const inputIdx = this.assessment.papers[paperIdx].inputs.findIndex( item => {
+				const qNum = parseInt(item.index.split(".")[0]); //indexes separated by dots
+				return qIdx == qNum;
+			});
+			if (inputIdx === -1)
+				return "grey";
+			if (_.isEqual(this.assessment.papers[paperIdx].inputs[inputIdx].input, this.assessment.questions[qIdx].answer))
+				return "green";
+			return "red";
+		},
+		seeDetails: function(number, i) {
+			// UNIMPLEMENTED: see question details, with current answer(s)
+		},
 		// stage 0 --> 1
 		startMonitoring: function() {
 			$.ajax("/start/monitoring", {
 				method: "GET",
 				data: {
-					password: this.password,
+					password: Sha1.Compute(this.password),
 					aname: examName,
-					cname: courseName,
+					ccode: courseCode,
 					initials: initials,
 				},
 				dataType: "json",
 				success: s => {
 					if (!!s.errmsg)
-						return this.warning(s.errmsg);
-					this.assessment = JSON.parse(s.assessment);
+						return alert(s.errmsg);
+					this.assessment = s.assessment;
+					this.answers.inputs = s.assessment.questions.map( q => { return q.answer; });
+					this.students = s.students;
 					this.stage = 1;
 					socket = io.connect("/", {
 						query: "aid=" + this.assessment._id + "&secret=" + s.secret
@@ -47,10 +91,27 @@ new Vue({
 						let paperIdx = this.assessment.papers.findIndex( item => {
 							return item.number == m.number;
 						});
-						this.assessment.papers[paperIdx].inputs.push(m.input); //answer+index
+						if (paperIdx === -1)
+						{
+							// First answer
+							paperIdx = this.assessment.papers.length;
+							this.assessment.papers.push({
+								number: m.number,
+								inputs: [ ], //other fields irrelevant here
+							});
+						}
+						// TODO: notations not coherent (input / answer... when, which ?)
+						this.assessment.papers[paperIdx].inputs.push(m.answer); //input+index
 					});
 				},
 			});
 		},
+		endMonitoring: function() {
+			// In the end, send answers to students
+			socket.emit(
+				message.allAnswers,
+				{ answers: this.assessment.questions.map( q => { return q.answer; }) }
+			);
+		},
 	},
 });