X-Git-Url: https://git.auder.net/?p=qomet.git;a=blobdiff_plain;f=public%2Fjavascripts%2Fcomponents%2Fstatements.js;h=8cfbde3a505a6f9d2d78c2e6c49e4d71b3ef2496;hp=d93a97f239c5f1e5aad79db28c16f24a7b805d4d;hb=3b8117c51c644b050b87811f1a923f6b7e5b7916;hpb=435371c7ba4b60790953115b9ebed68a047bb0a3

diff --git a/public/javascripts/components/statements.js b/public/javascripts/components/statements.js
index d93a97f..8cfbde3 100644
--- a/public/javascripts/components/statements.js
+++ b/public/javascripts/components/statements.js
@@ -1,10 +1,17 @@
 Vue.component("statements", {
-	props: ['questions','inputs','showAnswers','index'], // index=-1 : show all, otherwise show current question
+	// 'answers' is an object containing
+	//   'inputs'(array),
+	//   'displayAll'(bool),
+	//   'showSolution'(bool),
+	//   'indices': order of appearance
+	//   'index': current integer index (focused question)
+	props: ['questions','answers'],
 	// 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 domTree = this.questions.map( (q,i) => {
+		// TODO: render nothing if answers is empty
+		let domTree = (this.questions || [ ]).map( (q,i) => {
 			let questionContent = [ ];
 			questionContent.push(
 				h(
@@ -30,7 +37,7 @@ Vue.component("statements", {
 						"input",
 						{
 							domProps: {
-								checked: this.inputs.length > 0 && this.inputs[i][idx],
+								checked: this.answers.inputs.length > 0 && this.answers.inputs[i][idx],
 								disabled: monitoring,
 							},
 							attrs: {
@@ -38,7 +45,7 @@ Vue.component("statements", {
 								type: "checkbox",
 							},
 							on: {
-								change: e => { this.inputs[i][idx] = e.target.checked; },
+								change: e => { this.answers.inputs[i][idx] = e.target.checked; },
 							},
 						},
 					)
@@ -62,8 +69,8 @@ Vue.component("statements", {
 						{
 							"class": {
 								option: true,
-								choiceCorrect: showAnswers && this.questions[i].answer.includes(idx),
-								choiceWrong: showAnswers && this.inputs[i][idx] && !questions[i].answer.includes(idx),
+								choiceCorrect: this.answers.showSolution && this.questions[i].answer.includes(idx),
+								choiceWrong: this.answers.showSolution && this.answers.inputs[i][idx] && !q.answer.includes(idx),
 							},
 						},
 						option
@@ -86,7 +93,7 @@ Vue.component("statements", {
 				{
 					"class": {
 						"question": true,
-						"hide": index >= 0 && index != i,
+						"hide": !this.answers.displayAll && this.answers.indices[this.answers.index] != i,
 					},
 				},
 				questionContent
@@ -99,9 +106,12 @@ Vue.component("statements", {
 					id: "statements",
 				},
 			},
-			questions
+			domTree
 		);
 	},
+	mounted: function() {
+		statementsLibsRefresh();
+	},
 	updated: function() {
 		// TODO: next line shouldn't be required: questions wordings + answer + options
 		// are processed earlier; their content should be updated at this time.