Index: lams_monitoring/web/timeLimit5.jsp
===================================================================
diff -u -r2bc8f0c2f65f02cb65aa7e90d0bbb612494a4588 -r0083f3733489a25a89db5cfa6810303c015acd8f
--- lams_monitoring/web/timeLimit5.jsp	(.../timeLimit5.jsp)	(revision 2bc8f0c2f65f02cb65aa7e90d0bbb612494a4588)
+++ lams_monitoring/web/timeLimit5.jsp	(.../timeLimit5.jsp)	(revision 0083f3733489a25a89db5cfa6810303c015acd8f)
@@ -4,27 +4,27 @@
 	.countdown-timeout {
 		color: #FF3333 !important;
 	}
-	
+
 	#time-limit-table .btn-success {
 		color: var(--bs-white);
 	}
-	
+
 	#time-limit-widget {
-	  /* The main widget sticks to right browser edge */
-	  position: fixed;
-	  top: 100px;
-	  right: 0;
-	  /* Collapsed by default */
-	  width: 145px;
-	  display: none;
-	  z-index: 3;
-	  transition: all 0s linear 0s;
+		/* The main widget sticks to right browser edge */
+		position: fixed;
+		top: 100px;
+		right: 0;
+		/* Collapsed by default */
+		width: 145px;
+		display: none;
+		z-index: 3;
+		transition: all 0s linear 0s;
 	}
-	
+
 	#time-limit-widget .btn-success {
 		float: none;
 	}
-	
+
 	#time-limit-widget .card-title {
 		font-size: 20px;
 		font-weight: normal;
@@ -34,479 +34,486 @@
 		text-align: center;
 		padding: 10px 0;
 	}
-	
+
 	#time-limit-widget #time-limit-widget-content > div button {
 		width: 70%;
 	}
-	
+
 	#time-limit-widget #absolute-time-limit-widget-value {
 		display: inline-block;
 		margin-left: 5px;
 	}
 </style>
 
 <script>
-// in minutes since learner entered the activity
-var relativeTimeLimit = ${param.relativeTimeLimit},
-	// in seconds since epoch started
-	absoluteTimeLimitFinish = ${empty param.absoluteTimeLimitFinish ? 'null' : param.absoluteTimeLimitFinish};
+	// in minutes since learner entered the activity
+	var relativeTimeLimit = <c:out value="${param.relativeTimeLimit}" />,
+			// in minutes since first learner entered the activity
+			absoluteTimeLimit = <c:out value="${param.absoluteTimeLimit}" />,
+			// in seconds since epoch started
+			absoluteTimeLimitFinish = <c:out value="${empty param.absoluteTimeLimitFinish ? 'null' : param.absoluteTimeLimitFinish}" />;
 
-$(document).ready(function(){
-	let timeLimitWidget = $('#time-limit-widget'),
-		timeLimitContent = $('#time-limit-widget-content', timeLimitWidget)
-			.on('hidden.bs.collapse', function () {
-				// leave just the timer icon
-				$('.panel-heading', timeLimitWidget).removeClass('collapsable-icon-left');
-				
-				timeLimitWidget.animate({
-					width: '145px'
-				}, function(){
-					// if hideTimeLimitLearnerWidget() set it to true, then we are deleting the widget
-					var remove = timeLimitContent.data('remove');
-					if (remove) {
-						window.setTimeout(function(){
-							// remove after a short delay
-							timeLimitWidget.hide();
-						}, 1000);
-					}
-				});
+	$(document).ready(function(){
+		let timeLimitWidget = $('#time-limit-widget'),
+				timeLimitContent = $('#time-limit-widget-content', timeLimitWidget)
+						.on('hidden.bs.collapse', function () {
+							// leave just the timer icon
+							$('.panel-heading', timeLimitWidget).removeClass('collapsable-icon-left');
 
-				sessionStorage.setItem('lams-time-limit-widget-open', false);				
-			})
-			.on('show.bs.collapse', function() {
-				// hide content at first as it does not look nice when widget get expanded
-				timeLimitContent.css('visibility', 'hidden');
-				timeLimitWidget.animate({
-					width: '200px'
-				}, function(){
-					$('.panel-heading', timeLimitWidget).addClass('collapsable-icon-left');
-					timeLimitContent.css('visibility', 'visible');
-				});
+							timeLimitWidget.animate({
+								width: '145px'
+							}, function(){
+								// if hideTimeLimitLearnerWidget() set it to true, then we are deleting the widget
+								var remove = timeLimitContent.data('remove');
+								if (remove) {
+									window.setTimeout(function(){
+										// remove after a short delay
+										timeLimitWidget.hide();
+									}, 1000);
+								}
+							});
 
-				sessionStorage.setItem('lams-time-limit-widget-open', true);
-			});
+							sessionStorage.setItem('lams-time-limit-widget-open', false);
+						})
+						.on('show.bs.collapse', function() {
+							// hide content at first as it does not look nice when widget get expanded
+							timeLimitContent.css('visibility', 'hidden');
+							timeLimitWidget.animate({
+								width: '200px'
+							}, function(){
+								$('.panel-heading', timeLimitWidget).addClass('collapsable-icon-left');
+								timeLimitContent.css('visibility', 'visible');
+							});
 
-	$('#time-limit-widget-heading', timeLimitWidget).click(function(){
-		if ($(this).data('prevent-toggle') === true){
-			return;
+							sessionStorage.setItem('lams-time-limit-widget-open', true);
+						});
+
+		$('#time-limit-widget-heading', timeLimitWidget).click(function(){
+			if ($(this).data('prevent-toggle') === true){
+				return;
+			}
+			timeLimitContent.collapse('toggle');
+		});
+
+		// create counter if absolute time limit is set
+		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 (absoluteTimeLimitFinish > new Date().getTime() / 1000) {
+				$('#time-limit-collapse').collapse('show');
+			}
 		}
-		timeLimitContent.collapse('toggle');
+
+		initInidividualTimeLimitAutocomplete();
 	});
-	
-	// create counter if absolute time limit is set
-	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 (absoluteTimeLimitFinish > new Date().getTime() / 1000) {
-			$('#time-limit-collapse').collapse('show');
-		}
-	}
-	
-	initInidividualTimeLimitAutocomplete();
-});
 
-function updateTimeLimit(type, toggle, adjust) {
-	// relavite time limit set
-	if (type == 'relative') {
-		// what is set at the moment on screen, not at server
-		var displayedRelativeTimeLimit = +$('#relative-time-limit-value').text();
-		
-		// start/stop
-		if (toggle !== null) {
-			
-			if (toggle === false) {
-				// stop, i.e. set time limit to 0
-				relativeTimeLimit = 0;
-				updateTimeLimitOnServer();
+	function updateTimeLimit(type, toggle, adjust) {
+		// relavite time limit set
+		if (type == 'relative') {
+			// what is set at the moment on screen, not at server
+			var displayedRelativeTimeLimit = +$('#relative-time-limit-value').text();
+
+			// start/stop
+			if (toggle !== null) {
+
+				if (toggle === false) {
+					// stop, i.e. set time limit to 0
+					relativeTimeLimit = 0;
+					updateTimeLimitOnServer();
+					return;
+				}
+
+				// start, i.e. set backend time limit to whatever is set on screen
+				if (toggle === true && displayedRelativeTimeLimit > 0) {
+					relativeTimeLimit = displayedRelativeTimeLimit;
+					// when teacher enables relative time limit, absolute one gets disabled
+					absoluteTimeLimitFinish = null;
+					updateTimeLimitOnServer();
+				}
 				return;
 			}
-			
-			// start, i.e. set backend time limit to whatever is set on screen
-			if (toggle === true && displayedRelativeTimeLimit > 0) {
-				relativeTimeLimit = displayedRelativeTimeLimit;
-				// when teacher enables relative time limit, absolute one gets disabled
-				absoluteTimeLimitFinish = null;
+
+			// no negative time limit is allowed
+			if (displayedRelativeTimeLimit == 0 && adjust < 0) {
+				return;
+			}
+
+			var adjustedRelativeTimeLimit = displayedRelativeTimeLimit + adjust;
+			// at least one minute is required
+			// if teacher wants to set less, he should disable the limit or click "finish now"
+			if (adjustedRelativeTimeLimit < 1) {
+				adjustedRelativeTimeLimit = 1;
+			}
+
+			// is time limit already enforced? if so, update the server
+			if (relativeTimeLimit > 0) {
+				relativeTimeLimit = adjustedRelativeTimeLimit;
 				updateTimeLimitOnServer();
+				return;
 			}
+
+			// if time limit is not enforced yet, just update the screen
+			displayedRelativeTimeLimit = adjustedRelativeTimeLimit;
+			$('#relative-time-limit-value').text(displayedRelativeTimeLimit);
+			$('#relative-time-limit-start').prop('disabled', false);
 			return;
 		}
-		
-		// no negative time limit is allowed
-		if (displayedRelativeTimeLimit == 0 && adjust < 0) {
-			return;
-		}
-		
-		var adjustedRelativeTimeLimit = displayedRelativeTimeLimit + adjust;
-		// at least one minute is required
-		// if teacher wants to set less, he should disable the limit or click "finish now"
-		if (adjustedRelativeTimeLimit < 1) {
-			adjustedRelativeTimeLimit = 1;
-		}
-		
-		// is time limit already enforced? if so, update the server
-		if (relativeTimeLimit > 0) {
-			relativeTimeLimit = adjustedRelativeTimeLimit;
-			updateTimeLimitOnServer();
-			return;
-		}
-		
-		// if time limit is not enforced yet, just update the screen
-		displayedRelativeTimeLimit = adjustedRelativeTimeLimit;
-		$('#relative-time-limit-value').text(displayedRelativeTimeLimit);
-		$('#relative-time-limit-start').prop('disabled', false);
-		return;
-	}
-	
-	if (type == 'absolute') {
-		// get existing value on counter, if it is set already
-		var counters = $('.absolute-time-limit-counter'),
-			secondsLeft = null;
-		if (counters.length > 0) {
-			var periods = counters.first().countdown('getTimes');
-			secondsLeft = $.countdown.periodsToSeconds(periods);
-		}
-		
-		if (toggle !== null) {
-			
-			// start/stop
-			if (toggle === false) {
-				absoluteTimeLimitFinish = null;
-				updateAbsoluteTimeLimitCounter();
+
+		if (type == 'absolute') {
+			// get existing value on counter, if it is set already
+			var counters = $('.absolute-time-limit-counter'),
+					secondsLeft = null;
+			if (counters.length > 0) {
+				var periods = counters.first().countdown('getTimes');
+				secondsLeft = $.countdown.periodsToSeconds(periods);
+			}
+
+			if (toggle !== null) {
+				// whatever is done with the predefined absolute time limit, do these actions
+				$('#absolute-time-limit-await-trigger, #absolute-time-limit-await-trigger-value').remove();
+				$('.absolute-time-limit-stepper').removeClass('d-none');
+				absoluteTimeLimit = 0;
+
+				// start/stop
+				if (toggle === false) {
+					absoluteTimeLimitFinish = null;
+					updateAbsoluteTimeLimitCounter();
+					return;
+				}
+
+				// turn on the time limit, if there is any value on counter set already
+				if (toggle === true && secondsLeft) {
+					updateAbsoluteTimeLimitCounter(secondsLeft, true);
+					return;
+				}
+
+				if (toggle === 'stop') {
+					absoluteTimeLimitFinish =  Math.round(new Date().getTime() / 1000);
+					updateAbsoluteTimeLimitCounter();
+				}
 				return;
-			} 
-			
-			// turn on the time limit, if there is any value on counter set already
-			if (toggle === true && secondsLeft) {
-				updateAbsoluteTimeLimitCounter(secondsLeft, true);
+			}
+
+			// counter is not set yet and user clicked negative value
+			if (!secondsLeft && adjust < 0) {
 				return;
 			}
-			
-			if (toggle === 'stop') {
-				absoluteTimeLimitFinish =  Math.round(new Date().getTime() / 1000);
-				updateAbsoluteTimeLimitCounter();
+
+			// adjust time
+			secondsLeft += adjust * 60;
+			if (secondsLeft < 60) {
+				secondsLeft = 60;
 			}
+
+			// is time limit already enforced, update the server
+			// if time limit is not enforced yet, just update the screen
+			updateAbsoluteTimeLimitCounter(secondsLeft);
+			$('#absolute-time-limit-start').prop('disabled', false);
 			return;
 		}
-		
-		// counter is not set yet and user clicked negative value
-		if (!secondsLeft && adjust < 0) {
-			return;
-		}
-		
-		// adjust time
-		secondsLeft += adjust * 60;
-		if (secondsLeft < 60) {
-			secondsLeft = 60;
-		}
 
-		// is time limit already enforced, update the server
-		// if time limit is not enforced yet, just update the screen
-		updateAbsoluteTimeLimitCounter(secondsLeft);
-		$('#absolute-time-limit-start').prop('disabled', false);
-		return;
-	}
-	
-	if (type == 'individual') {
-		// this method is called with updateTimeLimit.call() so we can change meaning of "this"
-		// and identify row and userUid
-		var button = $(this),
-			row = button.closest('.individual-time-limit-row'),
-			userId = row.data('userId'),
-			sessionId = row.data('sessionId'),
-			itemId = userId ? 'user-' + userId : 'group-' + sessionId;
-		
-		// disable individual time adjustment
-		if (toggle === false) {
-			updateIndividualTimeLimitOnServer(itemId);
+		if (type == 'individual') {
+			// this method is called with updateTimeLimit.call() so we can change meaning of "this"
+			// and identify row and userUid
+			var button = $(this),
+					row = button.closest('.individual-time-limit-row'),
+					userId = row.data('userId'),
+					sessionId = row.data('sessionId'),
+					itemId = userId ? 'user-' + userId : 'group-' + sessionId;
+
+			// disable individual time adjustment
+			if (toggle === false) {
+				updateIndividualTimeLimitOnServer(itemId);
+				return;
+			}
+			var existingAdjustment = +$('.individual-time-limit-value', row).text(),
+					newAdjustment = existingAdjustment + adjust;
+
+			updateIndividualTimeLimitOnServer(itemId, newAdjustment);
 			return;
 		}
-		var existingAdjustment = +$('.individual-time-limit-value', row).text(),
-			newAdjustment = existingAdjustment + adjust;
-		
-		updateIndividualTimeLimitOnServer(itemId, newAdjustment);
-		return;
 	}
-}
 
-function updateTimeLimitOnServer() {
-	
-	// absolute time limit has higher priority
-	if (absoluteTimeLimitFinish != null) {
-		relativeTimeLimit = 0;
+	function updateTimeLimitOnServer() {
+
+		// absolute time limit has higher priority
+		if (absoluteTimeLimitFinish != null) {
+			relativeTimeLimit = 0;
+		}
+
+		$.ajax({
+			'url' : '/lams/<c:out value="${param.controllerContext}" />/updateTimeLimit.do',
+			'type': 'post',
+			'cache' : 'false',
+			'data': {
+				'toolContentID' : '<c:out value="${param.toolContentId}" />',
+				'relativeTimeLimit' : relativeTimeLimit,
+				'absoluteTimeLimit' : absoluteTimeLimit,
+				'absoluteTimeLimitFinish' : absoluteTimeLimitFinish,
+				'<csrf:tokenname/>' : '<csrf:tokenvalue/>'
+			},
+			success : function(){
+				// update widgets
+				$('#relative-time-limit-value').text(relativeTimeLimit);
+
+				if (relativeTimeLimit > 0) {
+					$('#relative-time-limit-disabled').addClass('d-none');
+					$('#relative-time-limit-cancel').removeClass('d-none');
+					$('#relative-time-limit-enabled').removeClass('d-none');
+					$('#relative-time-limit-start').addClass('d-none');
+				} else {
+					$('#relative-time-limit-disabled').removeClass('d-none');
+					$('#relative-time-limit-cancel').addClass('d-none');
+					$('#relative-time-limit-enabled').addClass('d-none');
+					$('#relative-time-limit-start').removeClass('d-none').prop('disabled', true);
+				}
+
+				if (absoluteTimeLimitFinish === null) {
+					// no absolute time limit? destroy the counter
+					$('.absolute-time-limit-counter').countdown('destroy');
+					$('.absolute-time-limit-value').empty();
+					hideTimeLimitWidget(true);
+
+					$('#absolute-time-limit-disabled').removeClass('d-none');
+					$('#absolute-time-limit-cancel').addClass('d-none');
+					$('#absolute-time-limit-enabled').addClass('d-none');
+					$('#absolute-time-limit-start').removeClass('d-none').prop('disabled', true);
+					$('#absolute-time-limit-finish-now').prop('disabled', false);
+				} else {
+					showTimeLimitWidget(false);
+
+					$('#absolute-time-limit-disabled').addClass('d-none');
+					$('#absolute-time-limit-cancel').removeClass('d-none');
+					$('#absolute-time-limit-enabled').removeClass('d-none');
+					$('#absolute-time-limit-start').addClass('d-none');
+					$('#absolute-time-limit-finish-now').prop('disabled', absoluteTimeLimitFinish <= Math.round(new Date().getTime() / 1000));
+				}
+			}
+		});
 	}
-	
-	$.ajax({
-		'url' : '/lams/${param.controllerContext}/updateTimeLimit.do',
-		'type': 'post',
-		'cache' : 'false',
-		'data': {
-			'toolContentID' : '${param.toolContentId}',
-			'relativeTimeLimit' : relativeTimeLimit,
-			'absoluteTimeLimitFinish' : absoluteTimeLimitFinish,
-			'<csrf:tokenname/>' : '<csrf:tokenvalue/>'
-		},
-		success : function(){
-			// update widgets
-			$('#relative-time-limit-value').text(relativeTimeLimit);
-			
-			if (relativeTimeLimit > 0) {
-				$('#relative-time-limit-disabled').addClass('d-none');
-				$('#relative-time-limit-cancel').removeClass('d-none');
-				$('#relative-time-limit-enabled').removeClass('d-none');
-				$('#relative-time-limit-start').addClass('d-none');
-			} else {
-				$('#relative-time-limit-disabled').removeClass('d-none');
-				$('#relative-time-limit-cancel').addClass('d-none');
-				$('#relative-time-limit-enabled').addClass('d-none');
-				$('#relative-time-limit-start').removeClass('d-none').prop('disabled', true);
+
+	function updateAbsoluteTimeLimitCounter(secondsLeft, start) {
+		var now = Math.round(new Date().getTime() / 1000),
+				// preset means that counter is set just on screen and the time limit is not enforced for learners
+				preset = start !== true && absoluteTimeLimitFinish == null;
+
+		if (secondsLeft) {
+			if (!preset) {
+				// time limit is already enforced on server, so update it there now
+				absoluteTimeLimitFinish = now + secondsLeft;
+				updateTimeLimitOnServer();
 			}
-			
-			if (absoluteTimeLimitFinish === null) {
-				// no absolute time limit? destroy the counter
-				$('.absolute-time-limit-counter').countdown('destroy');
-				$('.absolute-time-limit-value').empty();
-				hideTimeLimitWidget(true);
-				
-				$('#absolute-time-limit-disabled').removeClass('d-none');
-				$('#absolute-time-limit-cancel').addClass('d-none');
-				$('#absolute-time-limit-enabled').addClass('d-none');
-				$('#absolute-time-limit-start').removeClass('d-none').prop('disabled', true);
-				$('#absolute-time-limit-finish-now').prop('disabled', false);
-			} else {
-				showTimeLimitWidget(false);
-				
-				$('#absolute-time-limit-disabled').addClass('d-none');
-				$('#absolute-time-limit-cancel').removeClass('d-none');
-				$('#absolute-time-limit-enabled').removeClass('d-none');
-				$('#absolute-time-limit-start').addClass('d-none');
-				$('#absolute-time-limit-finish-now').prop('disabled', absoluteTimeLimitFinish <= Math.round(new Date().getTime() / 1000));
+		} else {
+			if (absoluteTimeLimitFinish == null) {
+				// disable the counter
+				updateTimeLimitOnServer();
+				return;
 			}
+			// counter initialisation on page load or "finish now"
+			secondsLeft = absoluteTimeLimitFinish - now;
+			if (secondsLeft <= 0) {
+				// finish now
+				updateTimeLimitOnServer();
+			}
 		}
-	});
-}
 
-function updateAbsoluteTimeLimitCounter(secondsLeft, start) {
-	var now = Math.round(new Date().getTime() / 1000),
-		// preset means that counter is set just on screen and the time limit is not enforced for learners
-		preset = start !== true && absoluteTimeLimitFinish == null;
-	
-	if (secondsLeft) {
-		if (!preset) {
-			// time limit is already enforced on server, so update it there now
-			absoluteTimeLimitFinish = now + secondsLeft;
-			updateTimeLimitOnServer();
+		var counters = $('.absolute-time-limit-counter');
+
+		if (counters.length == 0) {
+			counters = $('<div />').attr('id', 'absolute-time-limit-panel-counter')
+					.addClass('absolute-time-limit-counter')
+					.appendTo('#absolute-time-limit-panel-value')
+					.add(
+							$('<div />').attr('id', 'absolute-time-limit-widget-counter')
+									.addClass('absolute-time-limit-counter')
+									.appendTo('#absolute-time-limit-widget-value'))
+					.countdown({
+						until: '+' + secondsLeft +'S',
+						format: 'hMS',
+						compact: true,
+						alwaysExpire : true,
+						onTick: function(periods) {
+							// check for 30 seconds or less and display timer in red
+							var secondsLeft = $.countdown.periodsToSeconds(periods),
+									keepOpen = secondsLeft <= 60 && secondsLeft > 0
+											&& $('#absolute-time-limit-start').hasClass('d-none'),
+									widgetToggle = $('#time-limit-widget-heading'),
+									expiredHideContainers = $('.expired-hide-container');
+
+							counters.data('keepOpen', keepOpen);
+							widgetToggle.data('prevent-toggle', keepOpen)
+
+							if (keepOpen) {
+								showTimeLimitWidget(true);
+								counters.addClass('countdown-timeout');
+							}
+
+							if (secondsLeft > 0) {
+								expiredHideContainers.show();
+
+								if (secondsLeft > 60) {
+									counters.removeClass('countdown-timeout');
+								}
+							} else {
+								expiredHideContainers.hide();
+							}
+						},
+						expiryText : '<span class="countdown-timeout"><fmt:message key="label.monitoring.time.limit.expired" /></span>'
+					});
+		} else {
+			// if counter is paused, we can not adjust time, so resume it for a moment
+			counters.countdown('resume');
+			counters.countdown('option', 'until', secondsLeft + 'S');
 		}
-	} else {
-		if (absoluteTimeLimitFinish == null) {
-			// disable the counter
-			updateTimeLimitOnServer();
-			return;
+
+		if (preset) {
+			counters.countdown('pause');
+			$('#absolute-time-limit-start').removeClass('disabled');
+		} else {
+			counters.countdown('resume');
 		}
-		// counter initialisation on page load or "finish now"
-		secondsLeft = absoluteTimeLimitFinish - now;
-		if (secondsLeft <= 0) {
-			// finish now
-			updateTimeLimitOnServer();
-		}
 	}
-	
-	var counters = $('.absolute-time-limit-counter');
 
-	if (counters.length == 0) {
-		counters = $('<div />').attr('id', 'absolute-time-limit-panel-counter')
-							  .addClass('absolute-time-limit-counter')
-							  .appendTo('#absolute-time-limit-panel-value')
-				  			  .add(
-						  		$('<div />').attr('id', 'absolute-time-limit-widget-counter')
-						  					.addClass('absolute-time-limit-counter')
-						  					.appendTo('#absolute-time-limit-widget-value'))
-							  .countdown({
-									until: '+' + secondsLeft +'S',
-									format: 'hMS',
-									compact: true,
-									alwaysExpire : true,
-									onTick: function(periods) {
-										// check for 30 seconds or less and display timer in red
-										var secondsLeft = $.countdown.periodsToSeconds(periods),
-											keepOpen = secondsLeft <= 60 && secondsLeft > 0 
-													   && $('#absolute-time-limit-start').hasClass('d-none'),
-											widgetToggle = $('#time-limit-widget-heading'),
-											expiredHideContainers = $('.expired-hide-container');
+	function timeLimitFinishNow(){
+		showConfirm('<fmt:message key="label.monitoring.time.limit.finish.now.confirm" />', function(){
+			updateTimeLimit('absolute', 'stop');
+		});
+	}
 
-										counters.data('keepOpen', keepOpen);
-										widgetToggle.data('prevent-toggle', keepOpen)
 
-										if (keepOpen) {
-											showTimeLimitWidget(true);
-											counters.addClass('countdown-timeout');
-										}
-										
-										if (secondsLeft > 0) {
-											expiredHideContainers.show();
-											
-											if (secondsLeft > 60) {
-												counters.removeClass('countdown-timeout');
-											}
-										} else {
-											expiredHideContainers.hide();
-										}
-									},
-									expiryText : '<span class="countdown-timeout"><fmt:message key="label.monitoring.time.limit.expired" /></span>'
-								});
-	} else {
-		// if counter is paused, we can not adjust time, so resume it for a moment
-		counters.countdown('resume');
-		counters.countdown('option', 'until', secondsLeft + 'S');
+	function initInidividualTimeLimitAutocomplete(){
+		$('#individual-time-limit-autocomplete').autocomplete({
+			'source' : '/lams/<c:out value="${param.controllerContext}" />/getPossibleIndividualTimeLimits.do?toolContentID=${param.toolContentId}',
+			'delay'  : 700,
+			'minLength' : 3,
+			'select' : function(event, ui){
+				// user ID or group ID, and default 0 adjustment
+				updateIndividualTimeLimitOnServer(ui.item.value, 0);
+
+				// clear search field
+				$(this).val('');
+				return false;
+			},
+			'focus': function() {
+				// Stop the autocomplete of resetting the value to the selected one
+				// It puts LAMS user ID instead of user name
+				event.preventDefault();
+			}
+		});
+
+		refreshInidividualTimeLimits();
 	}
-	
-	if (preset) {
-		counters.countdown('pause');
-		$('#absolute-time-limit-start').removeClass('disabled');
-	} else {
-		counters.countdown('resume');
-	}
-}
 
-function timeLimitFinishNow(){
-	showConfirm('<fmt:message key="label.monitoring.time.limit.finish.now.confirm" />', function(){
-		updateTimeLimit('absolute', 'stop');
-	});
-}
 
+	function updateIndividualTimeLimitOnServer(itemId, adjustment) {
+		$.ajax({
+			'url' : '/lams/<c:out value="${param.controllerContext}" />/updateIndividualTimeLimit.do',
+			'type': 'post',
+			'cache' : 'false',
+			'data': {
+				'toolContentID' : '<c:out value="${param.toolContentId}" />',
+				// itemId can user-<userId> or group-<groupId>
+				'itemId' : itemId,
+				'adjustment' : adjustment,
+				'<csrf:tokenname/>' : '<csrf:tokenvalue/>'
+			},
+			success : function(){
+				refreshInidividualTimeLimits();
+			}
+		});
+	}
 
-function initInidividualTimeLimitAutocomplete(){
-	$('#individual-time-limit-autocomplete').autocomplete({
-		'source' : '/lams/${param.controllerContext}/getPossibleIndividualTimeLimits.do?toolContentID=${param.toolContentId}',
-		'delay'  : 700,
-		'minLength' : 3,
-		'select' : function(event, ui){
-			// user ID or group ID, and default 0 adjustment
-			updateIndividualTimeLimitOnServer(ui.item.value, 0);
 
-			// clear search field
-			$(this).val('');
-			return false;
-		},
-		'focus': function() {
-			// Stop the autocomplete of resetting the value to the selected one
-			// It puts LAMS user ID instead of user name
-			event.preventDefault();
-		}
-	});
-	
-	refreshInidividualTimeLimits();
-}
+	function refreshInidividualTimeLimits() {
+		var table = $('#time-limit-table');
 
+		$.ajax({
+			'url' : '/lams/<c:out value="${param.controllerContext}" />/getExistingIndividualTimeLimits.do',
+			'dataType' : 'json',
+			'cache' : 'false',
+			'data': {
+				'toolContentID' : '<c:out value="${param.toolContentId}" />'
+			},
+			success : function(users) {
+				// remove existing time limits
+				$('.individual-time-limit-row', table).remove();
 
-function updateIndividualTimeLimitOnServer(itemId, adjustment) {
-	$.ajax({
-		'url' : '/lams/${param.controllerContext}/updateIndividualTimeLimit.do',
-		'type': 'post',
-		'cache' : 'false',
-		'data': {
-			'toolContentID' : '${param.toolContentId}',
-			// itemId can user-<userId> or group-<groupId>
-			'itemId' : itemId,
-			'adjustment' : adjustment,
-			'<csrf:tokenname/>' : '<csrf:tokenvalue/>'
-		},
-		success : function(){
-			refreshInidividualTimeLimits();
-		}
-	});
-}
+				if (!users) {
+					return;
+				}
 
+				var template = $('#individual-time-limit-template-row'),
+						now = new Date().getTime();
+				$.each(users, function(){
+					var row = template.clone()
+							.attr('id', 'individual-time-limit-row-' + this.userId)
+							.data('userId', this.userId)
+							.data('sessionId', this.sessionId)
+							.addClass('individual-time-limit-row')
+							.appendTo(table);
+					$('.individual-time-limit-user-name', row).text(this.name);
+					$('.individual-time-limit-value', row).text(this.adjustment);
 
-function refreshInidividualTimeLimits() {
-	var table = $('#time-limit-table');
-	
-	$.ajax({
-		'url' : '/lams/${param.controllerContext}/getExistingIndividualTimeLimits.do',
-		'dataType' : 'json',
-		'cache' : 'false',
-		'data': {
-			'toolContentID' : '${param.toolContentId}'
-		},
-		success : function(users) {
-			// remove existing time limits
-			$('.individual-time-limit-row', table).remove();
-			
-			if (!users) {
-				return;
+					row.removeClass('d-none');
+				});
 			}
-			
-			var template = $('#individual-time-limit-template-row'),
-				now = new Date().getTime();
-			$.each(users, function(){
-				var row = template.clone()
-								  .attr('id', 'individual-time-limit-row-' + this.userId)
-								  .data('userId', this.userId)
-								  .data('sessionId', this.sessionId)
-								  .addClass('individual-time-limit-row')
-								  .appendTo(table);
-				$('.individual-time-limit-user-name', row).text(this.name);
-				$('.individual-time-limit-value', row).text(this.adjustment);
-				
-				row.removeClass('d-none');
-			});
-		}
-	});
-}
+		});
+	}
 
-function hideTimeLimitWidget(remove){
-	var timeLimitWidget = $('#time-limit-widget'),
-		timeLimitContent = $('#time-limit-widget-content', timeLimitWidget);
-	if (timeLimitContent.hasClass('show')){
-		// if the widget is expanded, collapse it and then hide it
-		timeLimitContent.data('remove', remove).collapse('hide');
-	} else if (remove){
-		// if the widget is collapsed, hide it straight away
-		timeLimitWidget.hide();
+	function hideTimeLimitWidget(remove){
+		var timeLimitWidget = $('#time-limit-widget'),
+				timeLimitContent = $('#time-limit-widget-content', timeLimitWidget);
+		if (timeLimitContent.hasClass('show')){
+			// if the widget is expanded, collapse it and then hide it
+			timeLimitContent.data('remove', remove).collapse('hide');
+		} else if (remove){
+			// if the widget is collapsed, hide it straight away
+			timeLimitWidget.hide();
+		}
 	}
-}
 
-function showTimeLimitWidget(expand, immediateExpand) {
-	var timeLimitWidget = $('#time-limit-widget'),
-		timeLimitContent = $('#time-limit-widget-content', timeLimitWidget);
-	timeLimitWidget.show();
-	
-	if (expand && !timeLimitContent.hasClass('show')){
-		if (immediateExpand) {
-			timeLimitContent.addClass('show');
-			timeLimitWidget.css('width', '200px');
-		} else {
-			timeLimitContent.collapse('show');
+	function showTimeLimitWidget(expand, immediateExpand) {
+		var timeLimitWidget = $('#time-limit-widget'),
+				timeLimitContent = $('#time-limit-widget-content', timeLimitWidget);
+		timeLimitWidget.show();
+
+		if (expand && !timeLimitContent.hasClass('show')){
+			if (immediateExpand) {
+				timeLimitContent.addClass('show');
+				timeLimitWidget.css('width', '200px');
+			} else {
+				timeLimitContent.collapse('show');
+			}
 		}
 	}
-}
 
-function scrollToTimeLimitPanel() {
-		
-	    $([document.documentElement, document.body]).animate({
-	        scrollTop: $("#time-limit-panel").offset().top
-	    }, 500);
-	    
-	    $('#time-limit-collapse').collapse('show');
+	function scrollToTimeLimitPanel() {
 
-	    if (!$('#absolute-time-limit-widget-counter').data('keepOpen')){
-	    	hideTimeLimitWidget(false);
+		$([document.documentElement, document.body]).animate({
+			scrollTop: $("#time-limit-panel").offset().top
+		}, 500);
+
+		$('#time-limit-collapse').collapse('show');
+
+		if (!$('#absolute-time-limit-widget-counter').data('keepOpen')){
+			hideTimeLimitWidget(false);
 		}
-}
+	}
 </script>
 
 <c:set var="absoluteTimeLimitEnabled" value="${not empty param.absoluteTimeLimitFinish}" />
 <c:set var="relativeTimeLimitEnabled" value="${param.relativeTimeLimit != 0}" />
-		
+
 <div class="card mt-4" id="time-limit-panel">
 	<div class="card-header">
        	<span class="card-title">
        		<fmt:message key="label.monitoring.time.limit"/>
      	</span>
-    </div>
-  	<div class="card-body">
+	</div>
+	<div class="card-body">
 		<table id="time-limit-table" class="table align-middle">
 			<tr>
 				<td colspan="6"><h4><fmt:message key="label.monitoring.time.limit.relative"/></h4>
@@ -515,7 +522,7 @@
 			</tr>
 			<tr>
 				<td>
-					<span id="relative-time-limit-value">${param.relativeTimeLimit}</span>&nbsp;
+					<span id="relative-time-limit-value"><c:out value="${param.relativeTimeLimit}" /></span>&nbsp;
 					<fmt:message key="label.monitoring.time.limit.minutes"/>
 				</td>
 				<td class="text-center">
@@ -566,21 +573,35 @@
 				</td>
 			</tr>
 			<tr>
-				<td id="absolute-time-limit-panel-value" class="absolute-time-limit-value"></td>
+				<td id="absolute-time-limit-panel-value" class="absolute-time-limit-value">
+					<c:if test="${param.absoluteTimeLimit > 0}">
+						<span id="absolute-time-limit-await-trigger-value">
+							<c:out value="${param.absoluteTimeLimit}"/>&nbsp;
+							<fmt:message key="label.monitoring.time.limit.minutes"/>
+						</span>
+					</c:if>
+				</td>
 				<td class="text-center">
 					<div id="absolute-time-limit-enabled" class="text-success ${absoluteTimeLimitEnabled ? '' : 'd-none'}">
 						<fmt:message key="label.monitoring.time.limit.enabled"/>
 					</div>
-					<div id="absolute-time-limit-disabled" class="text-danger ${absoluteTimeLimitEnabled ? 'd-none' : ''}">
+					<div id="absolute-time-limit-disabled"
+						 class="text-danger ${absoluteTimeLimitEnabled or param.absoluteTimeLimit != 0 ? 'd-none' : ''}">
 						<fmt:message key="label.monitoring.time.limit.disabled"/>
 					</div>
+					<div id="absolute-time-limit-await-trigger"
+						 class="${absoluteTimeLimitEnabled or param.absoluteTimeLimit eq 0 ? 'd-none' : ''}">
+						<fmt:message key="label.monitoring.time.limit.absolute.await.trigger"/>
+					</div>
 				</td>
 				<td class="text-center">
-					<button id="absolute-time-limit-start" class="btn btn-success ${absoluteTimeLimitEnabled ? 'd-none' : ''}"
+					<button id="absolute-time-limit-start" class="btn btn-success
+						${absoluteTimeLimitEnabled or param.absoluteTimeLimit != 0 ? 'd-none' : ''}"
 							onClick="updateTimeLimit('absolute', true)" disabled>
 						<fmt:message key="label.monitoring.time.limit.start"/>
 					</button>
-					<button id="absolute-time-limit-cancel" class="btn btn-danger ${absoluteTimeLimitEnabled ? '' : 'd-none'}"
+					<button id="absolute-time-limit-cancel" class="btn btn-danger
+							${absoluteTimeLimitEnabled or param.absoluteTimeLimit > 0 ? '' : 'd-none'}"
 							onClick="updateTimeLimit('absolute', false)">
 						<fmt:message key="label.monitoring.time.limit.cancel"/>
 					</button>
@@ -592,34 +613,38 @@
 					</button>
 				</td>
 				<td class="text-center">
-					<button class="btn btn-secondary mb-1"
+					<button class="btn btn-secondary mb-1 absolute-time-limit-stepper
+								   ${param.absoluteTimeLimit != 0 ? 'd-none' : ''}"
 							onClick="updateTimeLimit('absolute', null, 1)">
 						<fmt:message key="label.monitoring.time.limit.plus.minute.1"/>
 					</button>
-					<button class="btn btn-secondary mb-1"
+					<button class="btn btn-secondary mb-1 absolute-time-limit-stepper
+								   ${param.absoluteTimeLimit != 0 ? 'd-none' : ''}"
 							onClick="updateTimeLimit('absolute', null, 5)">
 						<fmt:message key="label.monitoring.time.limit.plus.minute.5"/>
 					</button>
 				</td>
 				<td class="text-center">
-					<button class="btn btn-secondary mb-1"
+					<button class="btn btn-secondary mb-1 absolute-time-limit-stepper
+								   ${param.absoluteTimeLimit != 0 ? 'd-none' : ''}"
 							onClick="updateTimeLimit('absolute', null, -5)">
 						<fmt:message key="label.monitoring.time.limit.minus.minute.5"/>
 					</button>
-					<button class="btn btn-secondary mb-1"
+					<button class="btn btn-secondary mb-1 absolute-time-limit-stepper
+								   ${param.absoluteTimeLimit != 0 ? 'd-none' : ''}"
 							onClick="updateTimeLimit('absolute', null, -1)">
 						<fmt:message key="label.monitoring.time.limit.minus.minute.1"/>
 					</button>
 				</td>
 			</tr>
-							
+
 			<tr>
 				<td colspan="6" class="pt-3">
 					<h4><fmt:message key="label.monitoring.time.limit.individual"/></h4>
 					<p><fmt:message key="label.monitoring.time.limit.individual.desc"/></p>
 				</td>
 			</tr>
-			<tr>	
+			<tr>
 				<td colspan="3">
 					<div class="input-group">
 						<input id="individual-time-limit-autocomplete" type="text" class="form-control border-end-0"
@@ -630,7 +655,7 @@
 				</td>
 				<td colspan="3"></td>
 			</tr>
-			
+
 			<tr id="individual-time-limit-template-row" class="d-none">
 				<td class="individual-time-limit-user-name"></td>
 				<td  class="text-center">
@@ -668,7 +693,7 @@
 					</button>
 				</td>
 			</tr>
-			
+
 		</table>
 	</div>
 </div>
@@ -679,27 +704,27 @@
        	<span class="card-title">
     	   <i class="fa fa-clock"></i>
     	   <div id="absolute-time-limit-widget-value" class="absolute-time-limit-value"
-    	   		 title="<fmt:message key="label.monitoring.time.limit" />"></div>
+				title="<fmt:message key="label.monitoring.time.limit" />"></div>
      	</span>
-    </div>
+	</div>
 
-    <div id="time-limit-widget-content" class="collapse card-body" role="tabpanel"
-       	 aria-labelledby="time-limit-widget-heading">
-		<div class="expired-hide-container">				
+	<div id="time-limit-widget-content" class="collapse card-body" role="tabpanel"
+		 aria-labelledby="time-limit-widget-heading">
+		<div class="expired-hide-container">
 			<button class="btn btn-sm btn-success" id="time-limit-widget-add-1-minute"
 					onClick="updateTimeLimit('absolute', null, 1)">
 				<fmt:message key="label.monitoring.time.limit.plus.minute.1"/>
 			</button>
 		</div>
-		
-		<div class="expired-hide-container">				
+
+		<div class="expired-hide-container">
 			<button class="btn btn-sm btn-danger"
 					onClick="updateTimeLimit('absolute', false)">
 				<fmt:message key="label.monitoring.time.limit.cancel"/>
 			</button>
 		</div>
-		
-		<div>				
+
+		<div>
 			<button class="btn btn-sm btn-secondary"
 					onClick="scrollToTimeLimitPanel()">
 				<fmt:message key="label.monitoring.time.limit.show.controls"/>