X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=public%2Fjavascripts%2Fassessment.js;h=91e34fc90c0b1cb20292df0c170af0904ee1b436;hb=6bf4a38e1a82fdcdf1d2742a3e8937b26fe2e873;hp=1d6289464a33add517c36030f0b2e01d88f81dd1;hpb=2c545c26b465fe40dc308c321a11f5515cebc4c7;p=qomet.git

diff --git a/public/javascripts/assessment.js b/public/javascripts/assessment.js
index 1d62894..91e34fc 100644
--- a/public/javascripts/assessment.js
+++ b/public/javascripts/assessment.js
@@ -15,6 +15,15 @@ function checkWindowSize()
 	return window.innerWidth >= screen.width-3 && window.innerHeight >= screen.height-3;
 };
 
+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: "#assessment",
 	data: {
@@ -183,6 +192,9 @@ new Vue({
 					document.location.href= "/fullscreen";
 				}, false);
 			},
+			updated: function() {
+				libsRefresh(); //TODO: shouldn't be required: "MathJax" strings on start and assign them to assessment.questions. ...
+			},
 			methods: {
 				inputId: function(i,j) {
 					return "q" + i + "_" + "input" + j;
@@ -281,7 +293,8 @@ new Vue({
 				$("#leftButton, #rightButton").hide();
 				if (assessment.time > 0)
 				{
-					this.remainingTime = assessment.time * 60 - (!!paper ? paper.startTime/1000 : 0);
+					const deltaTime = !!paper ? Date.now() - paper.startTime : 0;
+					this.remainingTime = assessment.time * 60 - Math.round(deltaTime / 1000);
 					this.runTimer();
 				}
 				// Initialize structured answer(s) based on questions type and nesting (TODO: more general)
@@ -299,18 +312,12 @@ new Vue({
 				{
 					// Resuming
 					let indices = paper.inputs.map( input => { return input.index; });
-					let remainingIndices = _.difference(_.range(assessment.questions.length), indices);
+					let remainingIndices = _.difference( _.range(assessment.questions.length).map(String), indices );
 					assessment.indices = indices.concat( _.shuffle(remainingIndices) );
 				}
 				assessment.index = !!paper ? paper.inputs.length : 0;
+				Vue.nextTick(libsRefresh);
 				this.stage = 2;
-				Vue.nextTick( () => {
-					// Run Prism + MathJax on questions text
-					$("#statements").find("code[class^=language-]").each( (i,elem) => {
-						Prism.highlightElement(elem);
-					});
-					MathJax.Hub.Queue(["Typeset",MathJax.Hub,"statements"]);
-				});
 			};
 			if (assessment.mode == "open")
 				return initializeStage2();