Fix timing when reloading exam

[qomet.git] / public / javascripts / assessment.js

diff --git a/public/javascripts/assessment.js b/public/javascripts/assessment.js
index 5fe24cd..d0567d5 100644 (file)
--- 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)