Index: lams_monitoring/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -re0ca5962f24c57a3a693dc5046f8489ab23f5776 -r0083f3733489a25a89db5cfa6810303c015acd8f
--- lams_monitoring/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision e0ca5962f24c57a3a693dc5046f8489ab23f5776)
+++ lams_monitoring/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 0083f3733489a25a89db5cfa6810303c015acd8f)
@@ -506,6 +506,7 @@
 label.monitoring.time.limit.relative.desc = Set the duration in minutes that the learners will have to have to complete the assessment. The duration will apply from the moment each learner begins the assessment. For example, if set to 5 minutes, all learners will have 5 minutes from the moment each of them start the assessment.
 label.monitoring.time.limit.absolute = Duration for all learners
 label.monitoring.time.limit.absolute.desc = Set the number of minutes to finish the assessment for all learners. This duration applies to all learners regardless when each of them starts the assessment. Set the minutes and click Start for the time to apply.
+label.monitoring.time.limit.absolute.await.trigger = starts when first learner enters
 label.monitoring.time.limit.individual = Individual extensions
 label.monitoring.time.limit.individual.desc = Apply duration extensions for individual learners. Search the learner and then apply extra time.
 label.monitoring.time.limit.minutes = minutes
@@ -539,4 +540,4 @@
 label.monitoring.search.learners = Search learners
 button.copy.lesson.url.tooltip = Copy lesson link to clipboard
 learner.completed.activity.count = Completed activities
-learner.completed.lesson = Lesson finished
+learner.completed.lesson = Lesson finished
\ No newline at end of file
Index: lams_monitoring/web/timeLimit.jsp
===================================================================
diff -u -r2bc8f0c2f65f02cb65aa7e90d0bbb612494a4588 -r0083f3733489a25a89db5cfa6810303c015acd8f
--- lams_monitoring/web/timeLimit.jsp	(.../timeLimit.jsp)	(revision 2bc8f0c2f65f02cb65aa7e90d0bbb612494a4588)
+++ lams_monitoring/web/timeLimit.jsp	(.../timeLimit.jsp)	(revision 0083f3733489a25a89db5cfa6810303c015acd8f)
@@ -4,33 +4,33 @@
 	.countdown-timeout {
 		color: #FF3333 !important;
 	}
-	
+
 	#time-limit-table th {
 		vertical-align: middle;
 	}
-	
+
 	#time-limit-table td.centered {
 		text-align: center;
 	}
-		
+
 	#time-limit-widget {
-	  /* The main widget sticks to right browser edge */
-	  position: fixed;
-	  top: 45px;
-	  right: 0;
-	  /* Collapsed by default */
-	  width: 130px;
-	  display: none;
+		/* The main widget sticks to right browser edge */
+		position: fixed;
+		top: 45px;
+		right: 0;
+		/* Collapsed by default */
+		width: 130px;
+		display: none;
 	}
-	
+
 	#time-limit-widget .btn-success {
 		float: none;
 	}
-	
+
 	#time-limit-widget .panel-heading a:after, #time-limit-widget .panel-heading a:after {
 		content: none;
 	}
-	
+
 	#time-limit-widget .panel-title a {
 		/* Underlining the link in title does not look nice*/
 		text-decoration: none !important;
@@ -43,702 +43,727 @@
 		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 = <c:out value="${param.relativeTimeLimit}" />,
-	// in seconds since epoch started
-	absoluteTimeLimitFinish = <c:out value="${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: '130px'
-				}, 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: '130px'
+							}, 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-toggle', timeLimitWidget).click(function(){
-		if ($(this).data('prevent-toggle') === true){
-			return;
+							sessionStorage.setItem('lams-time-limit-widget-open', true);
+						});
+
+		$('#time-limit-widget-toggle', 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('hidden');
+				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('hidden');
+					$('#relative-time-limit-cancel').removeClass('hidden');
+					$('#relative-time-limit-enabled').removeClass('hidden');
+					$('#relative-time-limit-start').addClass('hidden');
+				} else {
+					$('#relative-time-limit-disabled').removeClass('hidden');
+					$('#relative-time-limit-cancel').addClass('hidden');
+					$('#relative-time-limit-enabled').addClass('hidden');
+					$('#relative-time-limit-start').removeClass('hidden').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('hidden');
+					$('#absolute-time-limit-cancel').addClass('hidden');
+					$('#absolute-time-limit-enabled').addClass('hidden');
+					$('#absolute-time-limit-start').removeClass('hidden').prop('disabled', true);
+					$('#absolute-time-limit-finish-now').prop('disabled', false);
+				} else {
+					showTimeLimitWidget(false);
+
+					$('#absolute-time-limit-disabled').addClass('hidden');
+					$('#absolute-time-limit-cancel').removeClass('hidden');
+					$('#absolute-time-limit-enabled').removeClass('hidden');
+					$('#absolute-time-limit-start').addClass('hidden');
+					$('#absolute-time-limit-finish-now').prop('disabled', absoluteTimeLimitFinish <= Math.round(new Date().getTime() / 1000));
+				}
+			}
+		});
 	}
-	
-	$.ajax({
-		'url' : '/lams/<c:out value="${param.controllerContext}" />/updateTimeLimit.do',
-		'type': 'post',
-		'cache' : 'false',
-		'data': {
-			'toolContentID' : '<c:out value="${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('hidden');
-				$('#relative-time-limit-cancel').removeClass('hidden');
-				$('#relative-time-limit-enabled').removeClass('hidden');
-				$('#relative-time-limit-start').addClass('hidden');
-			} else {
-				$('#relative-time-limit-disabled').removeClass('hidden');
-				$('#relative-time-limit-cancel').addClass('hidden');
-				$('#relative-time-limit-enabled').addClass('hidden');
-				$('#relative-time-limit-start').removeClass('hidden').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('hidden');
-				$('#absolute-time-limit-cancel').addClass('hidden');
-				$('#absolute-time-limit-enabled').addClass('hidden');
-				$('#absolute-time-limit-start').removeClass('hidden').prop('disabled', true);
-				$('#absolute-time-limit-finish-now').prop('disabled', false);
-			} else {
-				showTimeLimitWidget(false);
-				
-				$('#absolute-time-limit-disabled').addClass('hidden');
-				$('#absolute-time-limit-cancel').removeClass('hidden');
-				$('#absolute-time-limit-enabled').removeClass('hidden');
-				$('#absolute-time-limit-start').addClass('hidden');
-				$('#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('hidden'),
+									widgetToggle = $('#time-limit-widget-toggle'),
+									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();
+	}
+
+	function timeLimitFinishNow(){
+		if (confirm('<fmt:message key="label.monitoring.time.limit.finish.now.confirm" />')) {
+			updateTimeLimit('absolute', 'stop');
 		}
 	}
-	
-	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('hidden'),
-											widgetToggle = $('#time-limit-widget-toggle'),
-											expiredHideContainers = $('.expired-hide-container');
 
-										counters.data('keepOpen', keepOpen);
-										widgetToggle.data('prevent-toggle', keepOpen)
+	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);
 
-										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');
-	}
-	
-	if (preset) {
-		counters.countdown('pause');
-		$('#absolute-time-limit-start').removeClass('disabled');
-	} else {
-		counters.countdown('resume');
-	}
-}
+				// 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();
+			}
+		});
 
-function timeLimitFinishNow(){
-	if (confirm('<fmt:message key="label.monitoring.time.limit.finish.now.confirm" />')) {
-		updateTimeLimit('absolute', 'stop');
+		refreshInidividualTimeLimits();
 	}
-}
 
 
-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);
+	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();
+			}
+		});
+	}
 
-			// 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');
 
-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();
-		}
-	});
-}
+		$.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();
 
+				if (!users) {
+					return;
+				}
 
-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();
-			
-			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);
+
+					row.removeClass('hidden');
+				});
 			}
-			
-			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('hidden');
-			});
-		}
-	});
-}
+		});
+	}
 
-function hideTimeLimitWidget(remove){
-	var timeLimitWidget = $('#time-limit-widget'),
-		timeLimitContent = $('#time-limit-widget-content', timeLimitWidget);
-	if (timeLimitContent.hasClass('in')){
-		// 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('in')){
+			// 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('in')){
-		if (immediateExpand) {
-			timeLimitContent.addClass('in');
-			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('in')){
+			if (immediateExpand) {
+				timeLimitContent.addClass('in');
+				timeLimitWidget.css('width', '200px');
+			} else {
+				timeLimitContent.collapse('show');
+			}
 		}
 	}
-}
 
-function scrollToTimeLimitPanel() {
-	    $([document.documentElement, document.body]).animate({
-	        scrollTop: $("#time-limit-panel").offset().top
-	    }, 2000);
-	    
-	    $('#time-limit-collapse').collapse('show');
-	    
-	    if (!$('#absolute-time-limit-widget-counter').data('keepOpen')){
-	    	hideTimeLimitWidget(false);
+	function scrollToTimeLimitPanel() {
+		$([document.documentElement, document.body]).animate({
+			scrollTop: $("#time-limit-panel").offset().top
+		}, 2000);
+
+		$('#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="panel panel-default ${param.isTbl ? 'voffset20' : ''}" id="time-limit-panel">
-   	<c:choose>
-   		<c:when test="${param.isTbl}">
-   			 <div class="panel-heading">
+	<c:choose>
+	<c:when test="${param.isTbl}">
+	<div class="panel-heading">
 	        	<span class="panel-title">
 	        		<fmt:message key="label.monitoring.time.limit"/>
 	      		</span>
-	         </div>
-   			 <div class="panel-body">
-   		</c:when>
-   		<c:otherwise>
-    		<div class="panel-heading collapsable-icon-left" id="time-limit-heading">
+	</div>
+	<div class="panel-body">
+		</c:when>
+		<c:otherwise>
+		<div class="panel-heading collapsable-icon-left" id="time-limit-heading">
 	        	<span class="panel-title">
 			    	<a class="collapsed" role="button" data-toggle="collapse" href="#time-limit-collapse" aria-expanded="false" aria-controls="time-limit-collapse" >
 		          		<fmt:message key="label.monitoring.time.limit"/>
 		        	</a>
 	      		</span>
-	        </div>
-	        <div id="time-limit-collapse" class="panel-body panel-collapse collapse" role="tabpanel" aria-labelledby="time-limit-heading">
-   		</c:otherwise>
-   	</c:choose>
-      
-		<table id="time-limit-table" class="table">
-			<tr class="info">
-				<td colspan="6"><h4><fmt:message key="label.monitoring.time.limit.relative"/></h4>
-					<p><fmt:message key="label.monitoring.time.limit.relative.desc"/></p>
-				</td>
-			</tr>
-			<tr>
-				<td>
-					<span id="relative-time-limit-value"><c:out value="${param.relativeTimeLimit}" /></span>&nbsp;
-					<fmt:message key="label.monitoring.time.limit.minutes"/>
-				</td>
-				<td class="centered">
-					<div id="relative-time-limit-enabled" class="text-success ${relativeTimeLimitEnabled ? '' : 'hidden'}">
-						<fmt:message key="label.monitoring.time.limit.enabled"/>
-					</div>
-					<div id="relative-time-limit-disabled" class="text-danger ${relativeTimeLimitEnabled ? 'hidden' : ''}">
-						<fmt:message key="label.monitoring.time.limit.disabled"/>
-					</div>
-				</td>
-				<td class="centered">
-					<button id="relative-time-limit-start" class="btn btn-success btn-xs ${relativeTimeLimitEnabled ? 'hidden' : ''}"
-							onClick="updateTimeLimit('relative', true)" disabled>
-						<fmt:message key="label.monitoring.time.limit.start"/>
-					</button>
-					<button id="relative-time-limit-cancel" class="btn btn-danger btn-xs ${relativeTimeLimitEnabled ? '' : 'hidden'}"
-							onClick="updateTimeLimit('relative', false)">
-						<fmt:message key="label.monitoring.time.limit.cancel"/>
-					</button>
-				</td>
-				<td>
-					<!-- Finish now button at absolute time limit row -->
-				</td>
-				<td class="centered">
-					<button class="btn btn-default btn-xs"
-							onClick="updateTimeLimit('relative', null, 1)">
-						<fmt:message key="label.monitoring.time.limit.plus.minute.1"/>
-					</button>
-					<button class="btn btn-default btn-xs"
-							onClick="updateTimeLimit('relative', null, 5)">
-						<fmt:message key="label.monitoring.time.limit.plus.minute.5"/>
-					</button>
-				</td>
-				<td class="centered">
-					<button class="btn btn-default btn-xs"
-							onClick="updateTimeLimit('relative', null, -5)">
-						<fmt:message key="label.monitoring.time.limit.minus.minute.5"/>
-					</button>
-					<button class="btn btn-default btn-xs"
-							onClick="updateTimeLimit('relative', null, -1)">
-						<fmt:message key="label.monitoring.time.limit.minus.minute.1"/>
-					</button>
-				</td>
-			</tr>
-			<tr>
-				<td colspan="6">
-	                        <div style="height: 30px; overflow:hidden;">
-	                        </div>
-				</td>
-			</tr>	
-			<tr class="info">
-				<td colspan="6"><h4><fmt:message key="label.monitoring.time.limit.absolute"/></h4>
-					<p><fmt:message key="label.monitoring.time.limit.absolute.desc"/></p>
-				</td>
-			</tr>
-			<tr>
-				<td id="absolute-time-limit-panel-value" class="absolute-time-limit-value"></td>
-				<td>
-					<div id="absolute-time-limit-enabled" class="text-success ${absoluteTimeLimitEnabled ? '' : 'hidden'}">
-						<fmt:message key="label.monitoring.time.limit.enabled"/>
-					</div>
-					<div id="absolute-time-limit-disabled" class="text-danger ${absoluteTimeLimitEnabled ? 'hidden' : ''}">
-						<fmt:message key="label.monitoring.time.limit.disabled"/>
-					</div>
-				</td>
-				<td class="centered">
-					<button id="absolute-time-limit-start" class="btn btn-success btn-xs ${absoluteTimeLimitEnabled ? 'hidden' : ''}"
-							onClick="updateTimeLimit('absolute', true)" disabled>
-						<fmt:message key="label.monitoring.time.limit.start"/>
-					</button>
-					<button id="absolute-time-limit-cancel" class="btn btn-danger btn-xs ${absoluteTimeLimitEnabled ? '' : 'hidden'}"
-							onClick="updateTimeLimit('absolute', false)">
-						<fmt:message key="label.monitoring.time.limit.cancel"/>
-					</button>
-				</td>
-				<td class="centered">
-					<button id="absolute-time-limit-finish-now" class="btn btn-warning btn-xs"
-							onClick="timeLimitFinishNow()">
-						<fmt:message key="label.monitoring.time.limit.finish.now"/>
-					</button>
-				</td>
-				<td class="centered">
-					<button class="btn btn-default btn-xs"
-							onClick="updateTimeLimit('absolute', null, 1)">
-						<fmt:message key="label.monitoring.time.limit.plus.minute.1"/>
-					</button>
-					<button class="btn btn-default btn-xs"
-							onClick="updateTimeLimit('absolute', null, 5)">
-						<fmt:message key="label.monitoring.time.limit.plus.minute.5"/>
-					</button>
-				</td>
-				<td class="centered">
-					<button class="btn btn-default btn-xs"
-							onClick="updateTimeLimit('absolute', null, -5)">
-						<fmt:message key="label.monitoring.time.limit.minus.minute.5"/>
-					</button>
-					<button class="btn btn-default btn-xs"
-							onClick="updateTimeLimit('absolute', null, -1)">
-						<fmt:message key="label.monitoring.time.limit.minus.minute.1"/>
-					</button>
-				</td>
-			</tr>
-			<tr>
-	                  <td colspan="6">
-					  <div style="height: 30px; overflow:hidden;">
-					  </div>
-	                  </td>
-	              </tr>
-							
-			<tr>
-				<td colspan="6" class="info">
-					<h4><fmt:message key="label.monitoring.time.limit.individual"/></h4>
-					<p><fmt:message key="label.monitoring.time.limit.individual.desc"/></p>
-				</td>
-			</tr>
-			<tr>	
-				<td colspan="6">
-					<div class="input-group">
-	    				<span class="input-group-addon"><i class="fa fa-search"></i></span>
-	    				<input id="individual-time-limit-autocomplete" type="text" class="ui-autocomplete-input form-control input-sm" 
-	    	   				   placeholder='<fmt:message key="label.monitoring.time.limit.individual.placeholder" />' />
-					</div>
-				</td>
-			</tr>
-			
-			<tr id="individual-time-limit-template-row" class="hidden">
-				<td class="individual-time-limit-user-name"></td>
-				<td  class="centered">
-					<span class="individual-time-limit-value"></span>
-					<fmt:message key="label.monitoring.time.limit.minutes"/>
-					<!-- (<time class="timeago" />)  -->
-				</td>
-				<td class="centered">
-					<button id="individual-time-limit-cancel" class="btn btn-danger btn-xs"
-							onClick="updateTimeLimit.call(this, 'individual', false)">
-						<fmt:message key="label.monitoring.time.limit.cancel"/>
-					</button>
-				</td>
-				<td>
-					<!-- Finish now button at absolute time limit row -->
-				</td>
-				<td class="centered">
-					<button class="btn btn-default btn-xs"
-							onClick="updateTimeLimit.call(this, 'individual', null, 1)">
-						<fmt:message key="label.monitoring.time.limit.plus.minute.1"/>
-					</button>
-					<button class="btn btn-default btn-xs"
-							onClick="updateTimeLimit.call(this, 'individual', null, 5)">
-						<fmt:message key="label.monitoring.time.limit.plus.minute.5"/>
-					</button>
-				</td>
-				<td class="centered">
-					<button class="btn btn-default btn-xs"
-							onClick="updateTimeLimit.call(this, 'individual', null, -5)">
-						<fmt:message key="label.monitoring.time.limit.minus.minute.5"/>
-					</button>
-					<button class="btn btn-default btn-xs"
-							onClick="updateTimeLimit.call(this, 'individual', null, -1)">
-						<fmt:message key="label.monitoring.time.limit.minus.minute.1"/>
-					</button>
-				</td>
-			</tr>
-			
-		</table>
+		</div>
+		<div id="time-limit-collapse" class="panel-body panel-collapse collapse" role="tabpanel" aria-labelledby="time-limit-heading">
+			</c:otherwise>
+			</c:choose>
+
+			<table id="time-limit-table" class="table">
+				<tr class="info">
+					<td colspan="6"><h4><fmt:message key="label.monitoring.time.limit.relative"/></h4>
+						<p><fmt:message key="label.monitoring.time.limit.relative.desc"/></p>
+					</td>
+				</tr>
+				<tr>
+					<td>
+						<span id="relative-time-limit-value"><c:out value="${param.relativeTimeLimit}" /></span>&nbsp;
+						<fmt:message key="label.monitoring.time.limit.minutes"/>
+					</td>
+					<td class="centered">
+						<div id="relative-time-limit-enabled" class="text-success ${relativeTimeLimitEnabled ? '' : 'hidden'}">
+							<fmt:message key="label.monitoring.time.limit.enabled"/>
+						</div>
+						<div id="relative-time-limit-disabled" class="text-danger ${relativeTimeLimitEnabled ? 'hidden' : ''}">
+							<fmt:message key="label.monitoring.time.limit.disabled"/>
+						</div>
+					</td>
+					<td class="centered">
+						<button id="relative-time-limit-start" class="btn btn-success btn-xs ${relativeTimeLimitEnabled ? 'hidden' : ''}"
+								onClick="updateTimeLimit('relative', true)" disabled>
+							<fmt:message key="label.monitoring.time.limit.start"/>
+						</button>
+						<button id="relative-time-limit-cancel" class="btn btn-danger btn-xs ${relativeTimeLimitEnabled ? '' : 'hidden'}"
+								onClick="updateTimeLimit('relative', false)">
+							<fmt:message key="label.monitoring.time.limit.cancel"/>
+						</button>
+					</td>
+					<td>
+						<!-- Finish now button at absolute time limit row -->
+					</td>
+					<td class="centered">
+						<button class="btn btn-default btn-xs"
+								onClick="updateTimeLimit('relative', null, 1)">
+							<fmt:message key="label.monitoring.time.limit.plus.minute.1"/>
+						</button>
+						<button class="btn btn-default btn-xs"
+								onClick="updateTimeLimit('relative', null, 5)">
+							<fmt:message key="label.monitoring.time.limit.plus.minute.5"/>
+						</button>
+					</td>
+					<td class="centered">
+						<button class="btn btn-default btn-xs"
+								onClick="updateTimeLimit('relative', null, -5)">
+							<fmt:message key="label.monitoring.time.limit.minus.minute.5"/>
+						</button>
+						<button class="btn btn-default btn-xs"
+								onClick="updateTimeLimit('relative', null, -1)">
+							<fmt:message key="label.monitoring.time.limit.minus.minute.1"/>
+						</button>
+					</td>
+				</tr>
+				<tr>
+					<td colspan="6">
+						<div style="height: 30px; overflow:hidden;">
+						</div>
+					</td>
+				</tr>
+				<tr class="info">
+					<td colspan="6"><h4><fmt:message key="label.monitoring.time.limit.absolute"/></h4>
+						<p><fmt:message key="label.monitoring.time.limit.absolute.desc"/></p>
+					</td>
+				</tr>
+				<tr>
+					<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>
+						<div id="absolute-time-limit-enabled" class="text-success ${absoluteTimeLimitEnabled ? '' : 'hidden'}">
+							<fmt:message key="label.monitoring.time.limit.enabled"/>
+						</div>
+						<div id="absolute-time-limit-disabled"
+							 class="text-danger ${absoluteTimeLimitEnabled or param.absoluteTimeLimit != 0 ? 'hidden' : ''}">
+							<fmt:message key="label.monitoring.time.limit.disabled"/>
+						</div>
+						<div id="absolute-time-limit-await-trigger"
+							 class="text-success ${absoluteTimeLimitEnabled or param.absoluteTimeLimit eq 0 ? 'hidden' : ''}">
+							<fmt:message key="label.monitoring.time.limit.absolute.await.trigger"/>
+						</div>
+					</td>
+					<td class="centered">
+						<button id="absolute-time-limit-start" class="btn btn-success btn-xs
+							${absoluteTimeLimitEnabled or param.absoluteTimeLimit != 0 ? 'hidden' : ''}"
+								onClick="updateTimeLimit('absolute', true)" disabled>
+							<fmt:message key="label.monitoring.time.limit.start"/>
+						</button>
+						<button id="absolute-time-limit-cancel" class="btn btn-danger btn-xs
+							${absoluteTimeLimitEnabled or param.absoluteTimeLimit > 0 ? '' : 'hidden'}"
+								onClick="updateTimeLimit('absolute', false)">
+							<fmt:message key="label.monitoring.time.limit.cancel"/>
+						</button>
+					</td>
+					<td class="centered">
+						<button id="absolute-time-limit-finish-now" class="btn btn-warning btn-xs"
+								onClick="timeLimitFinishNow()">
+							<fmt:message key="label.monitoring.time.limit.finish.now"/>
+						</button>
+					</td>
+					<td class="centered">
+						<button class="btn btn-default btn-xs absolute-time-limit-stepper
+								   ${param.absoluteTimeLimit != 0 ? 'hidden' : ''}"
+								onClick="updateTimeLimit('absolute', null, 1)">
+							<fmt:message key="label.monitoring.time.limit.plus.minute.1"/>
+						</button>
+						<button class="btn btn-default btn-xs absolute-time-limit-stepper
+								   ${param.absoluteTimeLimit != 0 ? 'hidden' : ''}"
+								onClick="updateTimeLimit('absolute', null, 5)">
+							<fmt:message key="label.monitoring.time.limit.plus.minute.5"/>
+						</button>
+					</td>
+					<td class="centered">
+						<button class="btn btn-default btn-xs absolute-time-limit-stepper
+								   ${param.absoluteTimeLimit != 0 ? 'hidden' : ''}"
+								onClick="updateTimeLimit('absolute', null, -5)">
+							<fmt:message key="label.monitoring.time.limit.minus.minute.5"/>
+						</button>
+						<button class="btn btn-default btn-xs absolute-time-limit-stepper
+								   ${param.absoluteTimeLimit != 0 ? 'hidden' : ''}"
+								onClick="updateTimeLimit('absolute', null, -1)">
+							<fmt:message key="label.monitoring.time.limit.minus.minute.1"/>
+						</button>
+					</td>
+				</tr>
+				<tr>
+					<td colspan="6">
+						<div style="height: 30px; overflow:hidden;">
+						</div>
+					</td>
+				</tr>
+
+				<tr>
+					<td colspan="6" class="info">
+						<h4><fmt:message key="label.monitoring.time.limit.individual"/></h4>
+						<p><fmt:message key="label.monitoring.time.limit.individual.desc"/></p>
+					</td>
+				</tr>
+				<tr>
+					<td colspan="6">
+						<div class="input-group">
+							<span class="input-group-addon"><i class="fa fa-search"></i></span>
+							<input id="individual-time-limit-autocomplete" type="text" class="ui-autocomplete-input form-control input-sm"
+								   placeholder='<fmt:message key="label.monitoring.time.limit.individual.placeholder" />' />
+						</div>
+					</td>
+				</tr>
+
+				<tr id="individual-time-limit-template-row" class="hidden">
+					<td class="individual-time-limit-user-name"></td>
+					<td  class="centered">
+						<span class="individual-time-limit-value"></span>
+						<fmt:message key="label.monitoring.time.limit.minutes"/>
+						<!-- (<time class="timeago" />)  -->
+					</td>
+					<td class="centered">
+						<button id="individual-time-limit-cancel" class="btn btn-danger btn-xs"
+								onClick="updateTimeLimit.call(this, 'individual', false)">
+							<fmt:message key="label.monitoring.time.limit.cancel"/>
+						</button>
+					</td>
+					<td>
+						<!-- Finish now button at absolute time limit row -->
+					</td>
+					<td class="centered">
+						<button class="btn btn-default btn-xs"
+								onClick="updateTimeLimit.call(this, 'individual', null, 1)">
+							<fmt:message key="label.monitoring.time.limit.plus.minute.1"/>
+						</button>
+						<button class="btn btn-default btn-xs"
+								onClick="updateTimeLimit.call(this, 'individual', null, 5)">
+							<fmt:message key="label.monitoring.time.limit.plus.minute.5"/>
+						</button>
+					</td>
+					<td class="centered">
+						<button class="btn btn-default btn-xs"
+								onClick="updateTimeLimit.call(this, 'individual', null, -5)">
+							<fmt:message key="label.monitoring.time.limit.minus.minute.5"/>
+						</button>
+						<button class="btn btn-default btn-xs"
+								onClick="updateTimeLimit.call(this, 'individual', null, -1)">
+							<fmt:message key="label.monitoring.time.limit.minus.minute.1"/>
+						</button>
+					</td>
+				</tr>
+
+			</table>
+		</div>
 	</div>
-</div>
 
-<div class="panel panel-default" id="time-limit-widget">
-	<div class="panel-heading"
-		 id="time-limit-widget-heading">
+	<div class="panel panel-default" id="time-limit-widget">
+		<div class="panel-heading"
+			 id="time-limit-widget-heading">
        	<span class="panel-title">
 	    	<a class="collapsed" role="button" id="time-limit-widget-toggle">
 	    	   <i class="fa fa-clock-o"></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>
 	       	</a>
      	</span>
-    </div>
+		</div>
 
-    <div id="time-limit-widget-content" class="panel-collapse collapse" role="tabpanel"
-       	 aria-labelledby="time-limit-widget-heading">
-		<div class="expired-hide-container">				
-			<button class="btn 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 id="time-limit-widget-content" class="panel-collapse collapse" role="tabpanel"
+			 aria-labelledby="time-limit-widget-heading">
+			<div class="expired-hide-container">
+				<button class="btn 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">
+				<button class="btn btn-danger"
+						onClick="updateTimeLimit('absolute', false)">
+					<fmt:message key="label.monitoring.time.limit.cancel"/>
+				</button>
+			</div>
+
+			<div>
+				<button class="btn btn-default"
+						onClick="scrollToTimeLimitPanel()">
+					<fmt:message key="label.monitoring.time.limit.show.controls"/>
+				</button>
+			</div>
 		</div>
-		
-		<div class="expired-hide-container">				
-			<button class="btn btn-danger"
-					onClick="updateTimeLimit('absolute', false)">
-				<fmt:message key="label.monitoring.time.limit.cancel"/>
-			</button>
-		</div>
-		
-		<div>				
-			<button class="btn btn-default"
-					onClick="scrollToTimeLimitPanel()">
-				<fmt:message key="label.monitoring.time.limit.show.controls"/>
-			</button>
-		</div>
-	</div>
-</div>
\ No newline at end of file
+	</div>
\ No newline at end of file
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"/>
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
===================================================================
diff -u -r193e1ddf0d23bb2d90636908378b8dbe4a089dbc -r0083f3733489a25a89db5cfa6810303c015acd8f
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java	(.../AssessmentConstants.java)	(revision 193e1ddf0d23bb2d90636908378b8dbe4a089dbc)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java	(.../AssessmentConstants.java)	(revision 0083f3733489a25a89db5cfa6810303c015acd8f)
@@ -228,9 +228,10 @@
 
     //flux management
     public static final String COMPLETION_CHARTS_UPDATE_SINK_NAME = "assessment completion chart updated";
-
     public static final String ANSWERS_UPDATED_SINK_NAME = "assessment learner answers updated";
     public static final String LEARNER_TRAVERSED_SINK_NAME = "assessment learner traversed";
-
     public static final String COMPLETION_CHARTS_UPDATE_FLUX_NAME = "assessment completion chart updated";
+
+    public static final String TIME_LIMIT_PANEL_UPDATE_SINK_NAME = "assessment time limit panel updated";
+    public static final String TIME_LIMIT_PANEL_UPDATE_FLUX_NAME = "assessment time limit panel updated";
 }
\ No newline at end of file
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java
===================================================================
diff -u -r2bc8f0c2f65f02cb65aa7e90d0bbb612494a4588 -r0083f3733489a25a89db5cfa6810303c015acd8f
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java	(.../Assessment.java)	(revision 2bc8f0c2f65f02cb65aa7e90d0bbb612494a4588)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java	(.../Assessment.java)	(revision 0083f3733489a25a89db5cfa6810303c015acd8f)
@@ -500,7 +500,7 @@
 	return absoluteTimeLimitFinish;
     }
 
-    public Long getAbsoluteTimeLimitSeconds() {
+    public Long getAbsoluteTimeLimitFinishSeconds() {
 	return absoluteTimeLimitFinish == null
 		? null
 		: absoluteTimeLimitFinish.atZone(ZoneId.systemDefault()).toEpochSecond();
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
===================================================================
diff -u -r2bc8f0c2f65f02cb65aa7e90d0bbb612494a4588 -r0083f3733489a25a89db5cfa6810303c015acd8f
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision 2bc8f0c2f65f02cb65aa7e90d0bbb612494a4588)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision 0083f3733489a25a89db5cfa6810303c015acd8f)
@@ -102,15 +102,7 @@
 import org.lamsfoundation.lams.tool.assessment.dao.AssessmentResultDAO;
 import org.lamsfoundation.lams.tool.assessment.dao.AssessmentSessionDAO;
 import org.lamsfoundation.lams.tool.assessment.dao.AssessmentUserDAO;
-import org.lamsfoundation.lams.tool.assessment.dto.AssessmentResultDTO;
-import org.lamsfoundation.lams.tool.assessment.dto.AssessmentUserDTO;
-import org.lamsfoundation.lams.tool.assessment.dto.GradeStatsDTO;
-import org.lamsfoundation.lams.tool.assessment.dto.OptionDTO;
-import org.lamsfoundation.lams.tool.assessment.dto.QuestionDTO;
-import org.lamsfoundation.lams.tool.assessment.dto.QuestionSummary;
-import org.lamsfoundation.lams.tool.assessment.dto.ReflectDTO;
-import org.lamsfoundation.lams.tool.assessment.dto.UserSummary;
-import org.lamsfoundation.lams.tool.assessment.dto.UserSummaryItem;
+import org.lamsfoundation.lams.tool.assessment.dto.*;
 import org.lamsfoundation.lams.tool.assessment.model.Assessment;
 import org.lamsfoundation.lams.tool.assessment.model.AssessmentOptionAnswer;
 import org.lamsfoundation.lams.tool.assessment.model.AssessmentQuestion;
@@ -134,14 +126,11 @@
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
-import org.lamsfoundation.lams.util.FileUtil;
-import org.lamsfoundation.lams.util.JsonUtil;
-import org.lamsfoundation.lams.util.MessageService;
-import org.lamsfoundation.lams.util.NumberUtil;
-import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.util.*;
 import org.lamsfoundation.lams.util.excel.ExcelCell;
 import org.lamsfoundation.lams.util.excel.ExcelRow;
 import org.lamsfoundation.lams.util.excel.ExcelSheet;
+import org.lamsfoundation.lams.util.hibernate.HibernateSessionManager;
 import org.springframework.web.util.UriUtils;
 
 import com.fasterxml.jackson.databind.JsonNode;
@@ -213,6 +202,19 @@
 		AssessmentConstants.COMPLETION_CHARTS_UPDATE_SINK_NAME, contentId -> contentId);
 	FluxRegistry.bindSink(AssessmentConstants.ANSWERS_UPDATED_SINK_NAME,
 		AssessmentConstants.COMPLETION_CHARTS_UPDATE_SINK_NAME, contentId -> contentId);
+
+	FluxRegistry.initFluxMap(AssessmentConstants.TIME_LIMIT_PANEL_UPDATE_FLUX_NAME,
+		AssessmentConstants.TIME_LIMIT_PANEL_UPDATE_SINK_NAME, null, (Long toolContentId) -> {
+		    try {
+			// without separate session the flux fetches cached data
+			HibernateSessionManager.openSession();
+
+			ObjectNode timeLimitSettingsJson = getTimeLimitSettingsJson(toolContentId);
+			return timeLimitSettingsJson.toString();
+		    } finally {
+			HibernateSessionManager.closeSession();
+		    }
+		}, FluxMap.STANDARD_THROTTLE, FluxMap.STANDARD_TIMEOUT);
     }
 
     // *******************************************************************************
@@ -352,8 +354,13 @@
 	if (learnersStarted == 1 && assessment.getRelativeTimeLimit() == 0 && assessment.getAbsoluteTimeLimit() > 0
 		&& assessment.getAbsoluteTimeLimitFinish() == null) {
 	    assessment.setAbsoluteTimeLimitFinish(LocalDateTime.now().plusMinutes(assessment.getAbsoluteTimeLimit()));
+	    assessment.setAbsoluteTimeLimit(0);
 	    assessmentDao.saveObject(assessment);
+
+	    FluxRegistry.emit(CommonConstants.ACTIVITY_TIME_LIMIT_CHANGED_SINK_NAME, Set.of(toolContentId));
+	    FluxRegistry.emit(AssessmentConstants.TIME_LIMIT_PANEL_UPDATE_SINK_NAME, toolContentId);
 	}
+
 	AssessmentResult lastResult = getLastAssessmentResult(assessment.getUid(), Long.valueOf(userId));
 	if (lastResult == null) {
 	    return null;
@@ -907,6 +914,11 @@
 	return FluxRegistry.get(AssessmentConstants.COMPLETION_CHARTS_UPDATE_FLUX_NAME, toolContentId);
     }
 
+    @Override
+    public Flux<String> getTimeLimitPanelUpdateFlux(long toolContentId) {
+	return FluxRegistry.get(AssessmentConstants.TIME_LIMIT_PANEL_UPDATE_FLUX_NAME, toolContentId);
+    }
+
     /**
      * @return grade that user scored by answering that question
      */
@@ -4269,6 +4281,15 @@
 
     }
 
+    private ObjectNode getTimeLimitSettingsJson(long toolContentId) {
+	ObjectNode timeLimitSettings = JsonNodeFactory.instance.objectNode();
+	Assessment assessment = getAssessmentByContentId(toolContentId);
+	timeLimitSettings.put("relativeTimeLimit", assessment.getRelativeTimeLimit());
+	timeLimitSettings.put("absoluteTimeLimit", assessment.getAbsoluteTimeLimit());
+	timeLimitSettings.put("absoluteTimeLimitFinish", assessment.getAbsoluteTimeLimitFinishSeconds());
+	return timeLimitSettings;
+    }
+
     private Map<Integer, ArrayNode> getAnsweredQuestionsByUsersJson(long toolContentId) {
 	Map<Integer, List<String[]>> answeredQuestions = assessmentResultDao.getAnsweredQuestionsByUsersForCompletionChart(
 		toolContentId);
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
===================================================================
diff -u -rf8f156c0f021d60857760ea60579a41e1380288c -r0083f3733489a25a89db5cfa6810303c015acd8f
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java	(.../IAssessmentService.java)	(revision f8f156c0f021d60857760ea60579a41e1380288c)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java	(.../IAssessmentService.java)	(revision 0083f3733489a25a89db5cfa6810303c015acd8f)
@@ -262,6 +262,8 @@
 
     Flux<String> getCompletionChartsDataFlux(long toolContentId);
 
+    Flux<String> getTimeLimitPanelUpdateFlux(long toolContentId);
+
     void loadupLastAttempt(Long assessmentUid, Long userId, List<Set<QuestionDTO>> pagedQuestionDtos);
 
     /**
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
===================================================================
diff -u -r2bc8f0c2f65f02cb65aa7e90d0bbb612494a4588 -r0083f3733489a25a89db5cfa6810303c015acd8f
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 2bc8f0c2f65f02cb65aa7e90d0bbb612494a4588)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 0083f3733489a25a89db5cfa6810303c015acd8f)
@@ -90,7 +90,6 @@
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.util.HtmlUtils;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -252,11 +251,17 @@
 
     @RequestMapping(path = "/getCompletionChartsData", method = RequestMethod.GET, produces = MediaType.TEXT_EVENT_STREAM_VALUE)
     @ResponseBody
-    public Flux<String> getCompletionChartsData(@RequestParam long toolContentId)
-	    throws JsonProcessingException, IOException {
+    public Flux<String> getCompletionChartsData(@RequestParam long toolContentId) {
 	return service.getCompletionChartsDataFlux(toolContentId);
     }
 
+    @RequestMapping(path = "/getTimeLimitPanelUpdateFlux", method = RequestMethod.GET, produces = MediaType.TEXT_EVENT_STREAM_VALUE)
+    @ResponseBody
+    public Flux<String> getTimeLimitPanelUpdateFlux(@RequestParam long toolContentId, HttpServletResponse response) {
+	response.setContentType(MediaType.TEXT_EVENT_STREAM_VALUE);
+	return service.getTimeLimitPanelUpdateFlux(toolContentId);
+    }
+
     @RequestMapping("/userMasterDetail")
     public String userMasterDetail(HttpServletRequest request, HttpServletResponse response) {
 	Long userId = WebUtil.readLongParam(request, AttributeNames.PARAM_USER_ID);
@@ -912,26 +917,33 @@
     @RequestMapping(path = "/updateTimeLimit", method = RequestMethod.POST)
     @ResponseStatus(HttpStatus.OK)
     public void updateTimeLimit(@RequestParam(name = AssessmentConstants.PARAM_TOOL_CONTENT_ID) long toolContentId,
-	    @RequestParam int relativeTimeLimit, @RequestParam(required = false) Long absoluteTimeLimit) {
+	    @RequestParam int relativeTimeLimit, @RequestParam int absoluteTimeLimit,
+	    @RequestParam(required = false) Long absoluteTimeLimitFinish, @RequestParam(required = false) Long callId) {
 	if (relativeTimeLimit < 0) {
 	    throw new InvalidParameterException(
 		    "Relative time limit must not be negative and it is " + relativeTimeLimit);
 	}
-	if (absoluteTimeLimit != null && relativeTimeLimit != 0) {
+	if (absoluteTimeLimit < 0) {
 	    throw new InvalidParameterException(
+		    "Absolute time limit must not be negative and it is " + relativeTimeLimit);
+	}
+	if (absoluteTimeLimitFinish != null && relativeTimeLimit != 0) {
+	    throw new InvalidParameterException(
 		    "Relative time limit must not be provided when absolute time limit is set");
 	}
 
 	Assessment assessment = service.getAssessmentByContentId(toolContentId);
 	assessment.setRelativeTimeLimit(relativeTimeLimit);
+	assessment.setAbsoluteTimeLimit(absoluteTimeLimit);
 	// set time limit as seconds from start of epoch, using current server time zone
-	assessment.setAbsoluteTimeLimitFinish(absoluteTimeLimit == null
+	assessment.setAbsoluteTimeLimitFinish(absoluteTimeLimitFinish == null
 		? null
-		: LocalDateTime.ofEpochSecond(absoluteTimeLimit, 0, OffsetDateTime.now().getOffset()));
+		: LocalDateTime.ofEpochSecond(absoluteTimeLimitFinish, 0, OffsetDateTime.now().getOffset()));
 	service.saveOrUpdateAssessment(assessment);
 
 	// update monitoring UI where time limits are reflected on dashboard
 	FluxRegistry.emit(CommonConstants.ACTIVITY_TIME_LIMIT_CHANGED_SINK_NAME, Set.of(toolContentId));
+	FluxRegistry.emit(AssessmentConstants.TIME_LIMIT_PANEL_UPDATE_SINK_NAME, toolContentId);
     }
 
     @RequestMapping(path = "/getPossibleIndividualTimeLimits", method = RequestMethod.GET)
@@ -1063,6 +1075,9 @@
 	    }
 	}
 	service.saveOrUpdateAssessment(assessment);
+
+	FluxRegistry.emit(AssessmentConstants.TIME_LIMIT_PANEL_UPDATE_SINK_NAME, toolContentId);
+
     }
 
     @RequestMapping(path = "/displayChangeLeaderForGroupDialogFromActivity")
Index: lams_tool_assessment/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r2bc8f0c2f65f02cb65aa7e90d0bbb612494a4588 -r0083f3733489a25a89db5cfa6810303c015acd8f
--- lams_tool_assessment/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 2bc8f0c2f65f02cb65aa7e90d0bbb612494a4588)
+++ lams_tool_assessment/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 0083f3733489a25a89db5cfa6810303c015acd8f)
@@ -8,8 +8,9 @@
 <c:set var="timeLimitPanelUrl"><lams:LAMSURL/>monitoring/timeLimit.jsp</c:set>
 <c:url var="timeLimitPanelUrl" value="${timeLimitPanelUrl}">
 	<c:param name="toolContentId" value="${assessment.contentId}"/>
-	<c:param name="absoluteTimeLimitFinish" value="${assessment.absoluteTimeLimitSeconds}"/>
+	<c:param name="absoluteTimeLimitFinish" value="${assessment.absoluteTimeLimitFinishSeconds}"/>
 	<c:param name="relativeTimeLimit" value="${assessment.relativeTimeLimit}"/>
+	<c:param name="absoluteTimeLimit" value="${assessment.absoluteTimeLimit}"/>
 	<c:param name="isTbl" value="false" />
 	<c:param name="controllerContext" value="tool/laasse10/monitoring" />
 </c:url>
Index: lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp
===================================================================
diff -u -r2bc8f0c2f65f02cb65aa7e90d0bbb612494a4588 -r0083f3733489a25a89db5cfa6810303c015acd8f
--- lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp	(.../assessmentStudentChoices.jsp)	(revision 2bc8f0c2f65f02cb65aa7e90d0bbb612494a4588)
+++ lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp	(.../assessmentStudentChoices.jsp)	(revision 0083f3733489a25a89db5cfa6810303c015acd8f)
@@ -4,8 +4,9 @@
 <c:set var="timeLimitPanelUrl"><lams:LAMSURL/>monitoring/timeLimit5.jsp</c:set>
 <c:url var="timeLimitPanelUrl" value="${timeLimitPanelUrl}">
 	<c:param name="toolContentId" value="${assessment.contentId}"/>
-	<c:param name="absoluteTimeLimitFinish" value="${assessment.absoluteTimeLimitSeconds}"/>
+	<c:param name="absoluteTimeLimitFinish" value="${assessment.absoluteTimeLimitFinishSeconds}"/>
 	<c:param name="relativeTimeLimit" value="${assessment.relativeTimeLimit}"/>
+	<c:param name="absoluteTimeLimit" value="${assessment.absoluteTimeLimit}"/>
 	<c:param name="isTbl" value="true" />
 	<c:param name="controllerContext" value="tool/laasse10/monitoring" />
 </c:url>
Index: lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp
===================================================================
diff -u -r2bc8f0c2f65f02cb65aa7e90d0bbb612494a4588 -r0083f3733489a25a89db5cfa6810303c015acd8f
--- lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp	(.../iraAssessmentStudentChoices.jsp)	(revision 2bc8f0c2f65f02cb65aa7e90d0bbb612494a4588)
+++ lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp	(.../iraAssessmentStudentChoices.jsp)	(revision 0083f3733489a25a89db5cfa6810303c015acd8f)
@@ -4,8 +4,9 @@
 <c:set var="timeLimitPanelUrl"><lams:LAMSURL/>monitoring/timeLimit5.jsp</c:set>
 <c:url var="timeLimitPanelUrl" value="${timeLimitPanelUrl}">
 	<c:param name="toolContentId" value="${assessment.contentId}"/>
-	<c:param name="absoluteTimeLimitFinish" value="${assessment.absoluteTimeLimitSeconds}"/>
+	<c:param name="absoluteTimeLimitFinish" value="${assessment.absoluteTimeLimitFinishSeconds}"/>
 	<c:param name="relativeTimeLimit" value="${assessment.relativeTimeLimit}"/>
+	<c:param name="absoluteTimeLimit" value="${assessment.absoluteTimeLimit}"/>
 	<c:param name="isTbl" value="true" />
 	<c:param name="controllerContext" value="tool/laasse10/monitoring" />
 </c:url>
@@ -45,6 +46,19 @@
 			pageInitialised = false;
 
 	$(document).ready(function(){
+		openEventSource('<lams:WebAppURL />monitoring/getTimeLimitPanelUpdateFlux.do?toolContentId=${toolContentID}', function(event) {
+			if (!event.data) {
+				return;
+			}
+
+			// destroy existing absolute time limit counter before refresh
+			$('.absolute-time-limit-counter').countdown('destroy');
+			let data = JSON.parse(event.data);
+			$('#time-limit-panel-placeholder').load('<lams:LAMSURL/>monitoring/timeLimit5.jsp?toolContentId=${toolContentID}&absoluteTimeLimitFinish=' + data.absoluteTimeLimitFinish
+					+ '&relativeTimeLimit=' + data.relativeTimeLimit + '&absoluteTimeLimit=' + data.absoluteTimeLimit
+					+ '&isTbl=true&controllerContext=tool/laasse10/monitoring');
+		});
+
 		openEventSource('<lams:WebAppURL />monitoring/getCompletionChartsData.do?toolContentId=${toolContentID}', function(event) {
 			if (!event.data) {
 				return;
@@ -64,10 +78,7 @@
 			openQuestionModal.one('hidden.bs.modal', function() {
 				$('#student-choices-table').load('<lams:WebAppURL />tblmonitoring/iraAssessmentStudentChoicesTable.do?toolContentID=${toolContentID}');
 			});
-
 		});
-
-		$('#time-limit-panel-placeholder').load('${timeLimitPanelUrl}');
 	});
 
 	function exportExcel(){