ross/rts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch to easytimer lib (so we can pause!)

Browse Source
This commit is contained in:
Ross
2020-04-30 23:04:22 +01:00
parent 38138600fc
commit e75294f97e
5 changed files with 65 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/helpers.js
+1 -53
View File
@@ -39,56 +39,4 @@ export function formatBytes(bytes, decimals = 2) {
const i = Math.floor(Math.log(bytes) / Math.log(k));
return parseFloat((bytes / Math.pow(k, i)).toFixed(dm)) + " " + sizes[i];
}
export function CountDownTimer(duration, granularity) {
this.duration = duration;
this.granularity = granularity || 1000;
this.tickFtns = [];
this.running = false;
}
CountDownTimer.prototype.start = function () {
if (this.running) {
return;
}
this.running = true;
var start = Date.now(),
that = this,
diff,
obj;
(function timer() {
diff = that.duration - (((Date.now() - start) / 1000) | 0);
if (diff > 0) {
setTimeout(timer, that.granularity);
} else {
diff = 0;
that.running = false;
}
obj = CountDownTimer.parse(diff);
that.tickFtns.forEach(function (ftn) {
ftn.call(this, obj.minutes, obj.seconds);
}, that);
})();
};
CountDownTimer.prototype.onTick = function (ftn) {
if (typeof ftn === 'function') {
this.tickFtns.push(ftn);
}
return this;
};
CountDownTimer.prototype.expired = function () {
return !this.running;
};
CountDownTimer.parse = function (seconds) {
return {
'minutes': (seconds / 60) | 0,
seconds: seconds % 60 | 0,
};
};
}
js/main.js
+41 -21
View File
@@ -149,16 +149,15 @@ function setUpQuestions() {
loadQuestion(0, 1, true);
createQuestionListPanel();
if (window.question_type == "rapid") {
window.exam_time = 35 * 60;
} else if (window.question_type == "anatomy"){
} else if (window.question_type == "anatomy") {
window.exam_time = 90 * 60;
} else if (window.question_type == "long"){
} else if (window.question_type == "long") {
window.exam_time = 75 * 60;
}
$("#exam-time").text(window.exam_time / 60)
$("#exam-time").text(window.exam_time / 60);
$("#start-dialog").modal();
}
@@ -1683,29 +1682,50 @@ $("#start-exam-button").click(function (evt) {
});
$("#start-packet-button").click(function (evt) {
//window.cid = parseInt($("#candidate-number").val());
// const t = 35 * 60;
let timer = new easytimer.Timer();
//window.exam_time = 2;
timer.start({ countdown: true, startValues: { seconds: window.exam_time } });
timer.addEventListener("secondsUpdated", function (e) {
$('#timer').html("Time left: " + timer.getTimeValues().toString());
});
timer.addEventListener("targetAchieved", function (e) {
$("#time-up-dialog").modal();
});
//const t = 2;
let display = document.querySelector("#timer");
let timer = new helper.CountDownTimer(window.exam_time);
let timeObj = helper.CountDownTimer.parse(window.exam_time);
$("#timer").click(() => {
timer.pause();
$("#pause").empty();
$("#pause").append(
$(
'<button id="resume-exam-button" class="navigation dialog-yes">Resume</button>'
).click(() => {
$("#pause").hide();
timer.start();
})
);
$("#pause").show();
});
format(timeObj.minutes, timeObj.seconds);
// //const t = 2;
// let display = document.querySelector("#timer");
// let timer = new helper.CountDownTimer(window.exam_time);
// let timeObj = helper.CountDownTimer.parse(window.exam_time);
timer.onTick(format);
// format(timeObj.minutes, timeObj.seconds);
timer.start();
// timer.onTick(format);
function format(minutes, seconds) {
minutes = minutes < 10 ? "0" + minutes : minutes;
seconds = seconds < 10 ? "0" + seconds : seconds;
display.textContent = "Time left: " + minutes + ":" + seconds;
// timer.start();
if (minutes == 0 && seconds == 0) {
$("#time-up-dialog").modal();
}
}
// function format(minutes, seconds) {
// minutes = minutes < 10 ? "0" + minutes : minutes;
// seconds = seconds < 10 ? "0" + seconds : seconds;
// display.textContent = "Time left: " + minutes + ":" + seconds;
// if (minutes == 0 && seconds == 0) {
// $("#time-up-dialog").modal();
// }
// }
$.modal.close();
});