Index: lams_monitoring/web/timeLimit5.jsp
===================================================================
diff -u -r9e131a46ef30a0bd2b9407498b3840e0801f064d -r2bc8f0c2f65f02cb65aa7e90d0bbb612494a4588
--- lams_monitoring/web/timeLimit5.jsp (.../timeLimit5.jsp) (revision 9e131a46ef30a0bd2b9407498b3840e0801f064d)
+++ lams_monitoring/web/timeLimit5.jsp (.../timeLimit5.jsp) (revision 2bc8f0c2f65f02cb65aa7e90d0bbb612494a4588)
@@ -49,7 +49,7 @@
// in minutes since learner entered the activity
var relativeTimeLimit = ${param.relativeTimeLimit},
// in seconds since epoch started
- absoluteTimeLimit = ${empty param.absoluteTimeLimit ? 'null' : param.absoluteTimeLimit};
+ absoluteTimeLimitFinish = ${empty param.absoluteTimeLimitFinish ? 'null' : param.absoluteTimeLimitFinish};
$(document).ready(function(){
let timeLimitWidget = $('#time-limit-widget'),
@@ -94,13 +94,13 @@
});
// create counter if absolute time limit is set
- if (absoluteTimeLimit) {
+ if (absoluteTimeLimitFinish) {
let timeLimitWidgetOpen = sessionStorage.getItem('lams-time-limit-widget-open') === "true";
showTimeLimitWidget(timeLimitWidgetOpen, timeLimitWidgetOpen);
updateAbsoluteTimeLimitCounter();
// expand time limit panel if absolute time limit is set and not expired
- if (absoluteTimeLimit > new Date().getTime() / 1000) {
+ if (absoluteTimeLimitFinish > new Date().getTime() / 1000) {
$('#time-limit-collapse').collapse('show');
}
}
@@ -128,7 +128,7 @@
if (toggle === true && displayedRelativeTimeLimit > 0) {
relativeTimeLimit = displayedRelativeTimeLimit;
// when teacher enables relative time limit, absolute one gets disabled
- absoluteTimeLimit = null;
+ absoluteTimeLimitFinish = null;
updateTimeLimitOnServer();
}
return;
@@ -173,7 +173,7 @@
// start/stop
if (toggle === false) {
- absoluteTimeLimit = null;
+ absoluteTimeLimitFinish = null;
updateAbsoluteTimeLimitCounter();
return;
}
@@ -185,7 +185,7 @@
}
if (toggle === 'stop') {
- absoluteTimeLimit = Math.round(new Date().getTime() / 1000);
+ absoluteTimeLimitFinish = Math.round(new Date().getTime() / 1000);
updateAbsoluteTimeLimitCounter();
}
return;
@@ -234,7 +234,7 @@
function updateTimeLimitOnServer() {
// absolute time limit has higher priority
- if (absoluteTimeLimit != null) {
+ if (absoluteTimeLimitFinish != null) {
relativeTimeLimit = 0;
}
@@ -245,7 +245,7 @@
'data': {
'toolContentID' : '${param.toolContentId}',
'relativeTimeLimit' : relativeTimeLimit,
- 'absoluteTimeLimit' : absoluteTimeLimit,
+ 'absoluteTimeLimitFinish' : absoluteTimeLimitFinish,
'