X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=public%2Fjavascripts%2Fassessment.js;h=d0567d52f4d9eb47d00aa867c3f44c050ca2d38f;hb=85cf9f89b9c046ff408e16734ea9eb781864ec9f;hp=5fe24cd24946414f20842e9e911914d0577b20ef;hpb=f03a2ad9e0b2fa36051def18d4c19c2f293cac1d;p=qomet.git

diff --git a/public/javascripts/assessment.js b/public/javascripts/assessment.js
index 5fe24cd..d0567d5 100644
--- a/public/javascripts/assessment.js
+++ b/public/javascripts/assessment.js
@@ -193,14 +193,15 @@ new Vue({
 				},
 				// stage 2
 				sendAnswer: function(realIndex) {
-					console.log(realIndex);
-					if (assessment.index == assessment.questions.length - 1)
-						this.$emit("gameover");
-					else
-						assessment.index++;
-					this.$forceUpdate(); //TODO: shouldn't be required
+					let gotoNext = () => {
+						if (assessment.index == assessment.questions.length - 1)
+							this.$emit("gameover");
+						else
+							assessment.index++;
+						this.$forceUpdate(); //TODO: shouldn't be required
+					};
 					if (assessment.mode == "open")
-						return; //only local
+						return gotoNext(); //only local
 					let answerData = {
 						aid: assessment._id,
 						answer: JSON.stringify({
@@ -220,6 +221,8 @@ new Vue({
 						success: ret => {
 							if (!!ret.errmsg)
 								return this.$emit("warning", ret.errmsg);
+							else
+								gotoNext();
 							//socket.emit(message.newAnswer, answer);
 						},
 					});
@@ -278,7 +281,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)