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

diff --git a/public/javascripts/monitor.js b/public/javascripts/monitor.js
index 1d32d0c..5d5f237 100644
--- a/public/javascripts/monitor.js
+++ b/public/javascripts/monitor.js
@@ -1,5 +1,3 @@
-// UNIMPLEMENTED
-
 // 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)
@@ -8,21 +6,8 @@
 // Affiché si (hash du) mdp du cours est correctement entré
 // Doit reprendre les données en base si refresh (sinon : sockets)
 
-// Also buttons "start exam", "end exam" for logged in teacher
-
-// TODO: réutiliser le component... trouver un moyen
-
 let socket = null; //monitor answers in real time
 
-function libsRefresh()
-{
-	// Run Prism + MathJax on questions text
-	$("#statements").find("code[class^=language-]").each( (i,elem) => {
-		Prism.highlightElement(elem);
-	});
-	MathJax.Hub.Queue(["Typeset",MathJax.Hub,"statements"]);
-}
-
 new Vue({
 	el: "#monitor",
 	data: {
@@ -31,144 +16,11 @@ new Vue({
 		// Stage 0: unauthenticated (password),
 		//       1: authenticated (password hash validated), start monitoring
 		stage: 0,
-	},
-	components: {
-		"statements": {
-			props: ['assessment','inputs','student','stage'],
-			// TODO: general render function for nested exercises
-			// There should be a questions navigator below, or next (visible if display=='all')
-			// Full questions tree is rendered, but some parts hidden depending on display settings
-			render(h) {
-				let self = this;
-				let questions = (assessment.questions || [ ]).map( (q,i) => {
-					let questionContent = [ ];
-					questionContent.push(
-						h(
-							"div",
-							{
-								"class": {
-									wording: true,
-								},
-								domProps: {
-									innerHTML: q.wording,
-								},
-							}
-						)
-					);
-					let optionsOrder = _.range(q.options.length);
-					if (!q.fixed)
-						optionsOrder = _.shuffle(optionsOrder);
-					let optionList = [ ];
-					optionsOrder.forEach( idx => {
-						let option = [ ];
-						option.push(
-							h(
-								"input",
-								{
-									domProps: {
-										checked: this.inputs.length > 0 && this.inputs[i][idx],
-									},
-									attrs: {
-										id: this.inputId(i,idx),
-										type: "checkbox",
-									},
-									on: {
-										change: e => { this.inputs[i][idx] = e.target.checked; },
-									},
-								},
-							)
-						);
-						option.push(
-							h(
-								"label",
-								{
-									domProps: {
-										innerHTML: q.options[idx],
-									},
-									attrs: {
-										"for": this.inputId(i,idx),
-									},
-								}
-							)
-						);
-						optionList.push(
-							h(
-								"div",
-								{
-									"class": {
-										option: true,
-										choiceCorrect: this.stage == 4 && assessment.questions[i].answer.includes(idx),
-										choiceWrong: this.stage == 4 && this.inputs[i][idx] && !assessment.questions[i].answer.includes(idx),
-									},
-								},
-								option
-							)
-						);
-					});
-					questionContent.push(
-						h(
-							"div",
-							{
-								"class": {
-									optionList: true,
-								},
-							},
-							optionList
-						)
-					);
-					return h(
-						"div",
-						{
-							"class": {
-								"question": true,
-								"hide": this.stage == 2 && assessment.display == 'one' && assessment.indices[assessment.index] != i,
-							},
-						},
-						questionContent
-					);
-				});
-				if (this.stage == 2)
-				{
-					questions.unshift(
-						h(
-							"button",
-							{
-								"class": {
-									"waves-effect": true,
-									"waves-light": true,
-									"btn": true,
-								},
-								style: {
-									"display": "block",
-									"margin-left": "auto",
-									"margin-right": "auto",
-								},
-								on: {
-									click: () => this.sendAnswer(assessment.indices[assessment.index]),
-								},
-							},
-							"Send"
-						)
-					);
-				}
-				return h(
-					"div",
-					{
-						attrs: {
-							id: "statements",
-						},
-					},
-					questions
-				);
-			},
-			mounted: function() {
-				libsRefresh();
-			},
-			methods: {
-				inputId: function(i,j) {
-					return "q" + i + "_" + "input" + j;
-				},
-			},
+		answers: {
+			displayAll: true,
+			showSolution: true, //TODO: allow to hide, to let teachers search too
+			inputs: [ ],
+			index : -1,
 		},
 	},
 	methods: {
@@ -177,54 +29,26 @@ new Vue({
 			$.ajax("/start/monitoring", {
 				method: "GET",
 				data: {
-					password: this.,
+					password: this.password,
 					aname: examName,
 					cname: courseName,
+					initials: initials,
 				},
 				dataType: "json",
 				success: s => {
 					if (!!s.errmsg)
 						return this.warning(s.errmsg);
+					this.assessment = JSON.parse(s.assessment);
 					this.stage = 1;
-				},
-			});
-		},
-		// TODO: 2-level sockets, for prof and monitors
-					socket = io.connect("/" + assessment.name, {
-						query: "number=" + this.student.number + "&password=" + this.password
+					socket = io.connect("/", {
+						query: "aid=" + this.assessment._id + "&secret=" + s.secret
+					});
+					socket.on(message.newAnswer, m => {
+						let paperIdx = this.assessment.papers.findIndex( item => {
+							return item.number == m.number;
+						});
+						this.assessment.papers[paperIdx].inputs.push(m.input); //answer+index
 					});
-					socket.on(message.allAnswers, this.setAnswers);
-					initializeStage2(s.questions, s.paper);
-				},
-			});
-		},
-		// stage 2 --> 3 (or 4)
-		// from a message by statements component, or time over
-		// TODO: also function startAssessment (for main teacher only)
-		endAssessment: function() {
-			// Set endTime, destroy password
-			$("#leftButton, #rightButton").show();
-			if (assessment.mode == "open")
-			{
-				this.stage = 4;
-				return;
-			}
-			$.ajax("/end/assessment", {
-				method: "GET",
-				data: {
-					aid: assessment._id,
-					number: this.student.number,
-					password: this.student.password,
-				},
-				dataType: "json",
-				success: ret => {
-					if (!!ret.errmsg)
-						return this.warning(ret.errmsg);
-					assessment.conclusion = ret.conclusion;
-					this.stage = 3;
-					delete this.student["password"]; //unable to send new answers now
-					socket.disconnect();
-					socket = null;
 				},
 			});
 		},