Index: idea_project/.idea/inspectionProfiles/Project_Default.xml
===================================================================
diff -u -r10ada76a9a401c0fb4842e107613be3ffcc8430b -reccd6838790a4369b6788e48fb5ae5851622fe35
--- idea_project/.idea/inspectionProfiles/Project_Default.xml	(.../Project_Default.xml)	(revision 10ada76a9a401c0fb4842e107613be3ffcc8430b)
+++ idea_project/.idea/inspectionProfiles/Project_Default.xml	(.../Project_Default.xml)	(revision eccd6838790a4369b6788e48fb5ae5851622fe35)
@@ -2,5 +2,6 @@
   <profile version="1.0">
     <option name="myName" value="Project Default" />
     <inspection_tool class="JavadocReference" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="SqlDialectInspection" enabled="false" level="WARNING" enabled_by_default="false" />
   </profile>
 </component>
\ No newline at end of file
Index: lams_monitoring/web/timeLimit5.jsp
===================================================================
diff -u -r0083f3733489a25a89db5cfa6810303c015acd8f -reccd6838790a4369b6788e48fb5ae5851622fe35
--- lams_monitoring/web/timeLimit5.jsp	(.../timeLimit5.jsp)	(revision 0083f3733489a25a89db5cfa6810303c015acd8f)
+++ lams_monitoring/web/timeLimit5.jsp	(.../timeLimit5.jsp)	(revision eccd6838790a4369b6788e48fb5ae5851622fe35)
@@ -504,7 +504,7 @@
 	}
 </script>
 
-<c:set var="absoluteTimeLimitEnabled" value="${not empty param.absoluteTimeLimitFinish}" />
+<c:set var="absoluteTimeLimitEnabled" value="${not empty param.absoluteTimeLimitFinish and param.absoluteTimeLimitFinish != 'null'}" />
 <c:set var="relativeTimeLimitEnabled" value="${param.relativeTimeLimit != 0}" />
 
 <div class="card mt-4" id="time-limit-panel">
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningWebsocketServer.java
===================================================================
diff -u -r2bc8f0c2f65f02cb65aa7e90d0bbb612494a4588 -reccd6838790a4369b6788e48fb5ae5851622fe35
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningWebsocketServer.java	(.../LearningWebsocketServer.java)	(revision 2bc8f0c2f65f02cb65aa7e90d0bbb612494a4588)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningWebsocketServer.java	(.../LearningWebsocketServer.java)	(revision eccd6838790a4369b6788e48fb5ae5851622fe35)
@@ -81,6 +81,9 @@
 	return assessmentService.launchTimeLimit(toolContentId, userId);
     }
 
+    /**
+     * Fetches or creates a singleton of this websocket server.
+     */
     public static LearningWebsocketServer getInstance() {
 	LearningWebsocketServer result = (LearningWebsocketServer) AbstractTimeLimitWebsocketServer.getInstance(
 		LearningWebsocketServer.class.getName());
@@ -91,9 +94,6 @@
 	return result;
     }
 
-    /**
-     * Fetches or creates a singleton of this websocket server.
-     */
     public static Long getSecondsLeft(long toolContentId, int userId) {
 	LearningWebsocketServer instance = LearningWebsocketServer.getInstance();
 	return AbstractTimeLimitWebsocketServer.getSecondsLeft(instance, toolContentId, userId, true);
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
===================================================================
diff -u -r0083f3733489a25a89db5cfa6810303c015acd8f -reccd6838790a4369b6788e48fb5ae5851622fe35
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 0083f3733489a25a89db5cfa6810303c015acd8f)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision eccd6838790a4369b6788e48fb5ae5851622fe35)
@@ -918,7 +918,7 @@
     @ResponseStatus(HttpStatus.OK)
     public void updateTimeLimit(@RequestParam(name = AssessmentConstants.PARAM_TOOL_CONTENT_ID) long toolContentId,
 	    @RequestParam int relativeTimeLimit, @RequestParam int absoluteTimeLimit,
-	    @RequestParam(required = false) Long absoluteTimeLimitFinish, @RequestParam(required = false) Long callId) {
+	    @RequestParam(required = false) Long absoluteTimeLimitFinish) {
 	if (relativeTimeLimit < 0) {
 	    throw new InvalidParameterException(
 		    "Relative time limit must not be negative and it is " + relativeTimeLimit);
Index: lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp
===================================================================
diff -u -r0083f3733489a25a89db5cfa6810303c015acd8f -reccd6838790a4369b6788e48fb5ae5851622fe35
--- lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp	(.../assessmentStudentChoices.jsp)	(revision 0083f3733489a25a89db5cfa6810303c015acd8f)
+++ lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp	(.../assessmentStudentChoices.jsp)	(revision eccd6838790a4369b6788e48fb5ae5851622fe35)
@@ -1,16 +1,6 @@
 <%@ include file="/common/taglibs.jsp"%>
 <% pageContext.setAttribute("newLineChar", "\r\n"); %>
 
-<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.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>
-
 <style>
 	.question-title {
     	overflow: auto;
@@ -49,6 +39,19 @@
 	COMPLETION_CHART_UPDATE_INTERVAL = 10 * 1000;
 
 	$(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;
@@ -59,8 +62,6 @@
 
 			$('#student-choices-table').load('<lams:WebAppURL />tblmonitoring/aesStudentChoicesTable.do?toolContentID=${toolContentID}');
 		});
-
-		$('#time-limit-panel-placeholder').load('${timeLimitPanelUrl}');
 	});
 		
 	function exportExcel(){
Index: lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp
===================================================================
diff -u -r0083f3733489a25a89db5cfa6810303c015acd8f -reccd6838790a4369b6788e48fb5ae5851622fe35
--- lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp	(.../iraAssessmentStudentChoices.jsp)	(revision 0083f3733489a25a89db5cfa6810303c015acd8f)
+++ lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp	(.../iraAssessmentStudentChoices.jsp)	(revision eccd6838790a4369b6788e48fb5ae5851622fe35)
@@ -1,20 +1,6 @@
 <%@ include file="/common/taglibs.jsp"%>
 <% pageContext.setAttribute("newLineChar", "\r\n"); %>
 
-<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.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>
-
-<style>
-
-</style>
-
 <lams:JSImport src="includes/javascript/chart5.js" relative="true" />
 
 <script>
Index: lams_tool_doku/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rb7b939abee8b76394e515ad32a6d3096ac501639 -reccd6838790a4369b6788e48fb5ae5851622fe35
--- lams_tool_doku/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b7b939abee8b76394e515ad32a6d3096ac501639)
+++ lams_tool_doku/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision eccd6838790a4369b6788e48fb5ae5851622fe35)
@@ -73,7 +73,12 @@
 label.cant.display.faulty.pad = This session has had problems with initialization. You can fix this by pressing the Recreate pad button.
 label.pad.started.fixing = Please wait. Pad is getting recreated now.
 label.pad.fixed = Pad has been successfully created. Please refresh the page to see its content.
-label.time.limit = Time limit (minutes)
+label.authoring.advance.time.limit = Time limit duration (minutes)
+label.authoring.advance.time.limit.none = none
+label.authoring.advance.time.limit.relative = relative to from student start
+label.authoring.advance.time.limit.relative.tooltip = Set the duration in minutes that the learners will 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.authoring.advance.time.limit.absolute = for all learners
+label.authoring.advance.time.limit.absolute.tooltip = Set the number of minutes to finish the assessment for all learners. The duration will apply from the moment the first learner starts the assessment.
 label.plus.one.minute = +1 minute
 label.start.activity = Start activity
 label.started.activity = Activity has been started
@@ -121,7 +126,6 @@
 label.authoring.basic.instructions.tooltip = If you want the students to have a template document to guide them on their collaborative response, add your template here.
 label.authoring.basic.description.tooltip = Description or case to be presented to students.
 label.attendance = Attendance
-label.time.limit.tooltip = Number of minutes that each student will get from the moment they enter this activity. Leave it at 0 for no time restrictions.
 label.monitoring.learner.marks.name = Name
 label.monitoring.learner.marks.copy.1 = Give all
 label.monitoring.learner.marks.copy.2 = marks
Index: lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -re2f52f574599806a41fe8864002496eaf73ff722 -reccd6838790a4369b6788e48fb5ae5851622fe35
--- lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision e2f52f574599806a41fe8864002496eaf73ff722)
+++ lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision eccd6838790a4369b6788e48fb5ae5851622fe35)
@@ -73,7 +73,12 @@
 label.cant.display.faulty.pad = This session has had problems with initialization. You can fix this by pressing the Recreate pad button.
 label.pad.started.fixing = Please wait. Pad is getting recreated now.
 label.pad.fixed = Pad has been successfully created. Please refresh the page to see its content.
-label.time.limit = Time limit (minutes)
+label.authoring.advance.time.limit = Time limit duration (minutes)
+label.authoring.advance.time.limit.none = none
+label.authoring.advance.time.limit.relative = relative to from student start
+label.authoring.advance.time.limit.relative.tooltip = Set the duration in minutes that the learners will 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.authoring.advance.time.limit.absolute = for all learners
+label.authoring.advance.time.limit.absolute.tooltip = Set the number of minutes to finish the assessment for all learners. The duration will apply from the moment the first learner starts the assessment.
 label.plus.one.minute = +1 minute
 label.start.activity = Start activity
 label.started.activity = Activity has been started
@@ -121,8 +126,10 @@
 label.authoring.basic.instructions.tooltip = If you want the students to have a template document to guide them on their collaborative response, add your template here.
 label.authoring.basic.description.tooltip = Description or case to be presented to students.
 label.attendance = Attendance
-label.time.limit.tooltip = Number of minutes that each student will get from the moment they enter this activity. Leave it at 0 for no time restrictions.
 label.monitoring.learner.marks.name = Name
+label.monitoring.learner.marks.copy.1 = Give all
+label.monitoring.learner.marks.copy.2 = marks
+label.monitoring.learner.marks.copy.tooltip = Give every learner in this group the same mark
 label.show.chat.tooltip = Enables the chat feature allowing students to exchange messages while working on the document simultaneously.
 monitoring.summary.gallery.walk.learner.edit = Let learners modify answers
 monitoring.summary.gallery.walk.learner.edit.confirm = Are you sure you want allows students to modify their answers while performing the Gallery Walk?
@@ -139,5 +146,4 @@
 label.sorry.the.deadline.has.passed = Sorry, the deadline to participate in this activity has passed. Please contact your teacher for further details.
 monitor.summary.notification = Notification
 monitor.summary.date.restriction.set = Date availability has been set
-monitor.summary.date.restriction.removed = Date availability has been removed
-
+monitor.summary.date.restriction.removed = Date availability has been removed
\ No newline at end of file
Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/DokumaranConstants.java
===================================================================
diff -u -r1621b6daf8385b83e75f7ffde03c017b05c12487 -reccd6838790a4369b6788e48fb5ae5851622fe35
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/DokumaranConstants.java	(.../DokumaranConstants.java)	(revision 1621b6daf8385b83e75f7ffde03c017b05c12487)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/DokumaranConstants.java	(.../DokumaranConstants.java)	(revision eccd6838790a4369b6788e48fb5ae5851622fe35)
@@ -124,4 +124,8 @@
     public static final String ATTR_SUBMISSION_DEADLINE = "submissionDeadline";
 
     public static final String ATTR_SUBMISSION_DEADLINE_DATESTRING = "submissionDateString";
-}
+
+    public static final String TIME_LIMIT_PANEL_UPDATE_SINK_NAME = "dokumaran time limit panel updated";
+    public static final String TIME_LIMIT_PANEL_UPDATE_FLUX_NAME = "dokumaran time limit panel updated";
+
+}
\ No newline at end of file
Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20230621.sql
===================================================================
diff -u
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20230621.sql	(revision 0)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20230621.sql	(revision eccd6838790a4369b6788e48fb5ae5851622fe35)
@@ -0,0 +1,15 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+SET FOREIGN_KEY_CHECKS=0;
+-- Put all sql statements below here
+
+-- LDEV-5401 Add learner-triggered absolute time limit
+ALTER TABLE tl_ladoku11_dokumaran RENAME COLUMN absolute_time_limit TO absolute_time_limit_finish;
+ALTER TABLE tl_ladoku11_dokumaran ADD COLUMN absolute_time_limit SMALLINT UNSIGNED NOT NULL DEFAULT '0' AFTER relative_time_limit;
+
+-- Put all sql statements above here
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
+SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.java
===================================================================
diff -u -re2f52f574599806a41fe8864002496eaf73ff722 -reccd6838790a4369b6788e48fb5ae5851622fe35
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.java	(.../Dokumaran.java)	(revision e2f52f574599806a41fe8864002496eaf73ff722)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.java	(.../Dokumaran.java)	(revision eccd6838790a4369b6788e48fb5ae5851622fe35)
@@ -92,8 +92,11 @@
     private int relativeTimeLimit;
 
     @Column(name = "absolute_time_limit")
-    private LocalDateTime absoluteTimeLimit;
+    private int absoluteTimeLimit;
 
+    @Column(name = "absolute_time_limit_finish")
+    private LocalDateTime absoluteTimeLimitFinish;
+
     @ElementCollection(fetch = FetchType.LAZY)
     @CollectionTable(name = "tl_ladoku11_time_limit", joinColumns = @JoinColumn(name = "dokumaran_uid"))
     @MapKeyColumn(name = "user_id")
@@ -183,7 +186,7 @@
 	    Dokumaran.log.error("When clone " + Dokumaran.class + " failed");
 	}
 
-	dokumaran.setAbsoluteTimeLimit(null);
+	dokumaran.setAbsoluteTimeLimitFinish(null);
 	dokumaran.setTimeLimitAdjustments(new HashMap<>(this.getTimeLimitAdjustments()));
 	dokumaran.setGalleryWalkStarted(false);
 	dokumaran.setGalleryWalkFinished(false);
@@ -230,11 +233,11 @@
     // **********************************************************
     // get/set methods
     // **********************************************************
+
     /**
      * Returns the object's creation date
      *
      * @return date
-     *
      */
     public Date getCreated() {
 	return created;
@@ -276,7 +279,7 @@
 
     /**
      * @param createdBy
-     *            The userid of the user who created this Share dokumaran.
+     * 	The userid of the user who created this Share dokumaran.
      */
     public void setCreatedBy(DokumaranUser createdBy) {
 	this.createdBy = createdBy;
@@ -299,7 +302,7 @@
 
     /**
      * @param title
-     *            The title to set.
+     * 	The title to set.
      */
     public void setTitle(String title) {
 	this.title = title;
@@ -322,7 +325,7 @@
 
     /**
      * @param lockWhenFinished
-     *            Set to true to lock the dokumaran for finished users.
+     * 	Set to true to lock the dokumaran for finished users.
      */
     public void setLockWhenFinished(boolean lockWhenFinished) {
 	this.lockWhenFinished = lockWhenFinished;
@@ -380,24 +383,34 @@
 
     /**
      * @param timeLimit
-     *            the time limitation, that students have to complete an attempt.
+     * 	the time limitation, that students have to complete an attempt.
      */
     public void setRelativeTimeLimit(int timeLimit) {
 	this.relativeTimeLimit = timeLimit;
     }
 
-    public LocalDateTime getAbsoluteTimeLimit() {
+    public int getAbsoluteTimeLimit() {
 	return absoluteTimeLimit;
     }
 
-    public void setAbsoluteTimeLimit(LocalDateTime absoluteTimeLimit) {
+    public void setAbsoluteTimeLimit(int absoluteTimeLimit) {
 	this.absoluteTimeLimit = absoluteTimeLimit;
     }
 
-    public Long getAbsoluteTimeLimitSeconds() {
-	return absoluteTimeLimit == null ? null : absoluteTimeLimit.atZone(ZoneId.systemDefault()).toEpochSecond();
+    public LocalDateTime getAbsoluteTimeLimitFinish() {
+	return absoluteTimeLimitFinish;
     }
 
+    public void setAbsoluteTimeLimitFinish(LocalDateTime absoluteTimeLimitFinish) {
+	this.absoluteTimeLimitFinish = absoluteTimeLimitFinish;
+    }
+
+    public Long getAbsoluteTimeLimitFinishSeconds() {
+	return absoluteTimeLimitFinish == null
+		? null
+		: absoluteTimeLimitFinish.atZone(ZoneId.systemDefault()).toEpochSecond();
+    }
+
     public Map<Integer, Integer> getTimeLimitAdjustments() {
 	return timeLimitAdjustments;
     }
Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
===================================================================
diff -u -r56aa4c936a358e32b0cbc287465f90fdfb9a90d5 -reccd6838790a4369b6788e48fb5ae5851622fe35
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java	(.../DokumaranService.java)	(revision 56aa4c936a358e32b0cbc287465f90fdfb9a90d5)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java	(.../DokumaranService.java)	(revision eccd6838790a4369b6788e48fb5ae5851622fe35)
@@ -33,6 +33,8 @@
 import org.lamsfoundation.lams.etherpad.EtherpadException;
 import org.lamsfoundation.lams.etherpad.service.IEtherpadService;
 import org.lamsfoundation.lams.etherpad.util.EtherpadUtil;
+import org.lamsfoundation.lams.flux.FluxMap;
+import org.lamsfoundation.lams.flux.FluxRegistry;
 import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learningdesign.Grouping;
 import org.lamsfoundation.lams.learningdesign.ToolActivity;
@@ -67,8 +69,10 @@
 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.CommonConstants;
 import org.lamsfoundation.lams.util.JsonUtil;
 import org.lamsfoundation.lams.util.MessageService;
+import org.lamsfoundation.lams.util.hibernate.HibernateSessionManager;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -115,6 +119,22 @@
 
     private DokumaranOutputFactory dokumaranOutputFactory;
 
+    public DokumaranService() {
+
+	FluxRegistry.initFluxMap(DokumaranConstants.TIME_LIMIT_PANEL_UPDATE_FLUX_NAME,
+		DokumaranConstants.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);
+    }
+
     // *******************************************************************************
     // Service method
     // *******************************************************************************
@@ -308,10 +328,30 @@
 
     @Override
     public LocalDateTime launchTimeLimit(long toolContentId, int userId) {
+	int learnersStarted = 0;
+	Dokumaran dokumaran = null;
+	for (DokumaranSession dokumaranSession : dokumaranSessionDao.getByContentId(toolContentId)) {
+	    if (dokumaran == null) {
+		dokumaran = dokumaranSession.getDokumaran();
+	    }
+	    learnersStarted += dokumaranUserDao.getBySessionID(dokumaranSession.getSessionId()).size();
+	    if (learnersStarted > 1) {
+		break;
+	    }
+	}
+	if (learnersStarted == 1 && dokumaran.getRelativeTimeLimit() == 0 && dokumaran.getAbsoluteTimeLimit() > 0
+		&& dokumaran.getAbsoluteTimeLimitFinish() == null) {
+	    dokumaran.setAbsoluteTimeLimitFinish(LocalDateTime.now().plusMinutes(dokumaran.getAbsoluteTimeLimit()));
+	    dokumaran.setAbsoluteTimeLimit(0);
+	    dokumaranDao.saveObject(dokumaran);
+
+	    FluxRegistry.emit(CommonConstants.ACTIVITY_TIME_LIMIT_CHANGED_SINK_NAME, Set.of(toolContentId));
+	    FluxRegistry.emit(DokumaranConstants.TIME_LIMIT_PANEL_UPDATE_SINK_NAME, toolContentId);
+	}
+
 	DokumaranUser user = getLearnerByIDAndContent(Long.valueOf(userId), toolContentId);
 	if (user != null) {
 	    DokumaranSession session = user.getSession();
-	    Dokumaran dokumaran = session.getDokumaran();
 
 	    LocalDateTime launchedDate = user.getTimeLimitLaunchedDate();
 	    if (launchedDate == null) {
@@ -1009,6 +1049,16 @@
 	etherpadService.createCookie(etherpadSessionIds, response);
     }
 
+
+    private ObjectNode getTimeLimitSettingsJson(long toolContentId) {
+	ObjectNode timeLimitSettings = JsonNodeFactory.instance.objectNode();
+	Dokumaran dokumaran = getDokumaranByContentId(toolContentId);
+	timeLimitSettings.put("relativeTimeLimit", dokumaran.getRelativeTimeLimit());
+	timeLimitSettings.put("absoluteTimeLimit", dokumaran.getAbsoluteTimeLimit());
+	timeLimitSettings.put("absoluteTimeLimitFinish", dokumaran.getAbsoluteTimeLimitFinishSeconds());
+	return timeLimitSettings;
+    }
+
     @Override
     public String leaveToolSession(Long toolSessionId, Long learnerId) throws DataMissingException, ToolException {
 	if (toolSessionId == null) {
Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningWebsocketServer.java
===================================================================
diff -u -r2bc8f0c2f65f02cb65aa7e90d0bbb612494a4588 -reccd6838790a4369b6788e48fb5ae5851622fe35
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningWebsocketServer.java	(.../LearningWebsocketServer.java)	(revision 2bc8f0c2f65f02cb65aa7e90d0bbb612494a4588)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningWebsocketServer.java	(.../LearningWebsocketServer.java)	(revision eccd6838790a4369b6788e48fb5ae5851622fe35)
@@ -30,8 +30,8 @@
 
     public LearningWebsocketServer() {
 	if (dokumaranService == null) {
-	    WebApplicationContext wac = WebApplicationContextUtils
-		    .getRequiredWebApplicationContext(SessionManager.getServletContext());
+	    WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(
+		    SessionManager.getServletContext());
 	    dokumaranService = (IDokumaranService) wac.getBean(DokumaranConstants.DOKUMARAN_SERVICE);
 	}
     }
@@ -49,8 +49,9 @@
 	Dokumaran dokumaran = dokumaranService.getDokumaranByContentId(toolContentId);
 	TimeCache existingTimeSettings = new TimeCache();
 
-	existingTimeSettings.absoluteTimeLimitFinish = dokumaran.getAbsoluteTimeLimit();
+	existingTimeSettings.absoluteTimeLimitFinish = dokumaran.getAbsoluteTimeLimitFinish();
 	existingTimeSettings.relativeTimeLimit = dokumaran.getRelativeTimeLimit() * 60;
+	existingTimeSettings.absoluteTimeLimit = dokumaran.getAbsoluteTimeLimit() * 60;
 	existingTimeSettings.timeLimitAdjustment = dokumaran.getTimeLimitAdjustments();
 
 	for (Integer userId : userIds) {
@@ -78,8 +79,8 @@
      * Fetches or creates a singleton of this websocket server.
      */
     public static LearningWebsocketServer getInstance() {
-	LearningWebsocketServer result = (LearningWebsocketServer) AbstractTimeLimitWebsocketServer
-		.getInstance(LearningWebsocketServer.class.getName());
+	LearningWebsocketServer result = (LearningWebsocketServer) AbstractTimeLimitWebsocketServer.getInstance(
+		LearningWebsocketServer.class.getName());
 	if (result == null) {
 	    result = new LearningWebsocketServer();
 	    AbstractTimeLimitWebsocketServer.registerInstance(result);
Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java
===================================================================
diff -u -r550d081b65db263d8987a1cfa42408bc75bba619 -reccd6838790a4369b6788e48fb5ae5851622fe35
--- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 550d081b65db263d8987a1cfa42408bc75bba619)
+++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision eccd6838790a4369b6788e48fb5ae5851622fe35)
@@ -29,6 +29,7 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.etherpad.EtherpadException;
+import org.lamsfoundation.lams.flux.FluxRegistry;
 import org.lamsfoundation.lams.gradebook.GradebookUserActivity;
 import org.lamsfoundation.lams.gradebook.service.IGradebookService;
 import org.lamsfoundation.lams.learningdesign.Group;
@@ -56,6 +57,7 @@
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
+import reactor.core.publisher.Flux;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -306,7 +308,7 @@
 
 	dokumaranService.startGalleryWalk(toolContentId);
 
-	updateTimeLimit(toolContentId, 0, null);
+	updateTimeLimit(toolContentId, 0, 0, null);
     }
 
     @RequestMapping("/finishGalleryWalk")
@@ -335,25 +337,42 @@
 	return "pages/monitoring/summary5";
     }
 
+    @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 FluxRegistry.get(DokumaranConstants.TIME_LIMIT_PANEL_UPDATE_FLUX_NAME, toolContentId);
+    }
+
     @RequestMapping(path = "/updateTimeLimit", method = RequestMethod.POST)
     @ResponseStatus(HttpStatus.OK)
     public void updateTimeLimit(@RequestParam(name = AttributeNames.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) {
 	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");
 	}
 
 	Dokumaran dokumaran = dokumaranService.getDokumaranByContentId(toolContentId);
 	dokumaran.setRelativeTimeLimit(relativeTimeLimit);
+	dokumaran.setAbsoluteTimeLimit(absoluteTimeLimit);
 	// set time limit as seconds from start of epoch, using current server time zone
-	dokumaran.setAbsoluteTimeLimit(absoluteTimeLimit == null
+	dokumaran.setAbsoluteTimeLimitFinish(absoluteTimeLimitFinish == null
 		? null
-		: LocalDateTime.ofEpochSecond(absoluteTimeLimit, 0, OffsetDateTime.now().getOffset()));
+		: LocalDateTime.ofEpochSecond(absoluteTimeLimitFinish, 0, OffsetDateTime.now().getOffset()));
+
+	// update monitoring UI where time limits are reflected on dashboard
+	FluxRegistry.emit(CommonConstants.ACTIVITY_TIME_LIMIT_CHANGED_SINK_NAME, Set.of(toolContentId));
+	FluxRegistry.emit(DokumaranConstants.TIME_LIMIT_PANEL_UPDATE_SINK_NAME, toolContentId);
 	dokumaranService.saveOrUpdate(dokumaran);
     }
 
@@ -485,6 +504,8 @@
 	    }
 	}
 	dokumaranService.saveOrUpdate(dokumaran);
+
+	FluxRegistry.emit(DokumaranConstants.TIME_LIMIT_PANEL_UPDATE_SINK_NAME, toolContentId);
     }
 
     /**
Index: lams_tool_doku/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4 -reccd6838790a4369b6788e48fb5ae5851622fe35
--- lams_tool_doku/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4)
+++ lams_tool_doku/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision eccd6838790a4369b6788e48fb5ae5851622fe35)
@@ -13,6 +13,7 @@
 
 	<!-- Initialise Spring MVC. Enforce path suffix use otherwise /start will be recognised but /start.do will not. -->
 	<mvc:annotation-driven>
+		<mvc:async-support default-timeout="10000" task-executor="serverTaskExecutor" />
 		<mvc:path-matching suffix-pattern="true" />
 	</mvc:annotation-driven>
 
Index: lams_tool_doku/web/WEB-INF/web.xml
===================================================================
diff -u -r3f3f34c22194aeaf302e1fd332925dffd35019aa -reccd6838790a4369b6788e48fb5ae5851622fe35
--- lams_tool_doku/web/WEB-INF/web.xml	(.../web.xml)	(revision 3f3f34c22194aeaf302e1fd332925dffd35019aa)
+++ lams_tool_doku/web/WEB-INF/web.xml	(.../web.xml)	(revision eccd6838790a4369b6788e48fb5ae5851622fe35)
@@ -28,6 +28,7 @@
 		<filter-class>
 			org.springframework.orm.hibernate5.support.OpenSessionInViewFilter
 		</filter-class>
+		<async-supported>true</async-supported>
 		<init-param>
 			<param-name>sessionFactoryBeanName</param-name>
 			<param-value>coreSessionFactory</param-value>
@@ -39,12 +40,14 @@
 		<filter-class>
 			org.lamsfoundation.lams.web.session.SystemSessionFilter
 		</filter-class>
+		<async-supported>true</async-supported>
 	</filter>
 	<filter>
 		<filter-name>LocaleFilter</filter-name>
 		<filter-class>
 			org.lamsfoundation.lams.web.filter.LocaleFilter
 		</filter-class>
+		<async-supported>true</async-supported>
 		<init-param>
 			<param-name>encoding</param-name>
 			<param-value>UTF-8</param-value>
@@ -53,23 +56,32 @@
 	<filter>
 		<filter-name>CSRFGuard</filter-name>
 		<filter-class>org.owasp.csrfguard.CsrfGuardFilter</filter-class>
+		<async-supported>true</async-supported>
 	</filter>
 
 	<filter-mapping>
 		<filter-name>hibernateFilter</filter-name>
 		<url-pattern>/*</url-pattern>
+		<dispatcher>REQUEST</dispatcher>
+		<dispatcher>ASYNC</dispatcher>
 	</filter-mapping>
 	<filter-mapping>
 		<filter-name>SystemSessionFilter</filter-name>
 		<url-pattern>/*</url-pattern>
+		<dispatcher>REQUEST</dispatcher>
+		<dispatcher>ASYNC</dispatcher>
 	</filter-mapping>
 	<filter-mapping>
 		<filter-name>LocaleFilter</filter-name>
 		<url-pattern>/*</url-pattern>
+		<dispatcher>REQUEST</dispatcher>
+		<dispatcher>ASYNC</dispatcher>
 	</filter-mapping>
 	<filter-mapping>
 		<filter-name>CSRFGuard</filter-name> 
 		<url-pattern>*.do</url-pattern>
+		<dispatcher>REQUEST</dispatcher>
+		<dispatcher>ASYNC</dispatcher>
 	</filter-mapping>
 
 	<servlet>
@@ -78,6 +90,7 @@
 			org.springframework.web.servlet.DispatcherServlet
 		</servlet-class>
 		<load-on-startup>1</load-on-startup>
+		<async-supported>true</async-supported>
 	</servlet>
 
 	<servlet>
@@ -92,6 +105,7 @@
 			<param-value>false</param-value>
 		</init-param>
 		<load-on-startup>1</load-on-startup>
+		<async-supported>true</async-supported>
 	</servlet>
 
 	<!-- The download servlet, reused from the content repository jar -->
@@ -105,6 +119,7 @@
 			<param-value>dokumaranToolContentHandler</param-value>
 		</init-param>
 		<load-on-startup>3</load-on-startup>
+		<async-supported>true</async-supported>
 	</servlet>
 
 	<servlet-mapping>
@@ -260,4 +275,4 @@
 		<error-code>404</error-code>
 		<location>/404.jsp</location>
 	</error-page>
-</web-app>
+</web-app>
\ No newline at end of file
Index: lams_tool_doku/web/pages/authoring/advance.jsp
===================================================================
diff -u -re2f52f574599806a41fe8864002496eaf73ff722 -reccd6838790a4369b6788e48fb5ae5851622fe35
--- lams_tool_doku/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision e2f52f574599806a41fe8864002496eaf73ff722)
+++ lams_tool_doku/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision eccd6838790a4369b6788e48fb5ae5851622fe35)
@@ -2,20 +2,46 @@
 
 <!-- Advance Tab Content -->
 
-<script>			
+<script>
 	// avoid name clash between bootstrap and jQuery UI
 	$.fn.bootstrapTooltip = $.fn.tooltip.noConflict();
-	
+
 	$(document).ready(function() {
 		$('#gallery-walk-enabled').change(function(){
 			if ($(this).is(':checked')) {
 				$('#gallery-walk-options').slideDown();
 			} else {
 				$('#gallery-walk-options').slideUp()
-					.find('#gallery-walk-read-only').prop('checked', false);
+						.find('#gallery-walk-read-only').prop('checked', false);
 			}
 		}).change();
-		
+
+
+		// time limit various options functionality
+		$('input[name="timeLimit"]').change(function(){
+			let timeLimitTypeNone = $('#timeLimitNone'),
+					timeLimitTypeRelative = $('#timeLimitRelative'),
+					timeLimitTypeRelativeValue = $('#timeLimitRelativeValue'),
+					timeLimitTypeAbsolute = $('#timeLimitAbsolute'),
+					timeLimitTypeAbsoluteValue = $('#timeLimitAbsoluteValue');
+
+			if (timeLimitTypeNone.prop('checked')) {
+				timeLimitTypeRelativeValue.prop('disabled', true).val(0);
+				timeLimitTypeAbsoluteValue.prop('disabled', true).val(0);
+				return;
+			}
+			if (timeLimitTypeRelative.prop('checked')) {
+				timeLimitTypeRelativeValue.prop('disabled', false);
+				timeLimitTypeAbsoluteValue.prop('disabled', true).val(0);
+				return;
+			}
+			if (timeLimitTypeAbsolute.prop('checked')) {
+				timeLimitTypeRelativeValue.prop('disabled', true).val(0);
+				timeLimitTypeAbsoluteValue.prop('disabled', false);
+				return;
+			}
+		}).first().change();
+
 		$('[data-toggle="tooltip"]').bootstrapTooltip();
 	});
 </script>
@@ -27,11 +53,11 @@
 			<fmt:message key="label.use.select.leader.tool.output" />
 		</label>
 	</div>
-	
+
 	<div class="checkbox">
 		<label for="allowMultipleLeaders">
 			<form:checkbox path="dokumaran.allowMultipleLeaders" value="1" id="allowMultipleLeaders"
-				disabled="${!authoringForm.dokumaran.useSelectLeaderToolOuput}"/>
+						   disabled="${!authoringForm.dokumaran.useSelectLeaderToolOuput}"/>
 			<fmt:message key="label.allow.multiple.leaders" />
 		</label>
 	</div>
@@ -42,77 +68,107 @@
 		<label for="maxMark">
 			<fmt:message key="label.authoring.advanced.maxMark" />
 		</label>
-        <form:input path="dokumaran.maxMark" type="number" min="1" max="100" size="2" id="maxMark" cssClass="form-control input-sm"/>        
-    </div>
-    
-	<div class="form-inline voffset10">
-		<label for="relativeTimeLimit">
-			<fmt:message key="label.time.limit" />&nbsp;
-            <i class="fa fa-question-circle" aria-hidden="true" data-toggle="tooltip" data-placement="top" title="" data-original-title="<fmt:message key="label.time.limit.tooltip"/>"></i>
-		</label>
-        <form:input path="dokumaran.relativeTimeLimit" type="number" min="0" size="2" id="relativeTimeLimit" cssClass="form-control input-sm"/>        
-    </div>
-	
+		<form:input path="dokumaran.maxMark" type="number" min="1" max="100" size="2" id="maxMark" cssClass="form-control input-sm"/>
+	</div>
+
 	<div class="checkbox">
 		<label for="showChat">
 			<form:checkbox path="dokumaran.showChat" id="showChat"/>
 			<fmt:message key="label.show.chat" />&nbsp;
-            <i class="fa fa-question-circle" aria-hidden="true" data-toggle="tooltip" data-placement="top" title="" data-original-title="<fmt:message key="label.show.chat.tooltip  "/>"></i>
+			<i class="fa fa-question-circle" aria-hidden="true" data-toggle="tooltip" data-placement="top" title="" data-original-title="<fmt:message key="label.show.chat.tooltip  "/>"></i>
 		</label>
 	</div>
-	
+
 	<div class="checkbox">
 		<label for="showLineNumbers">
 			<form:checkbox path="dokumaran.showLineNumbers" id="showLineNumbers"/>
 			<fmt:message key="label.show.line.numbers" />
 		</label>
 	</div>
-	
+
 	<div class="checkbox">
 		<label for="shared-pad-id-on">
-			<input type="checkbox" id="shared-pad-id-on" 
-				<c:if test="${not empty authoringForm.dokumaran.sharedPadId}">checked="checked"</c:if>/>
+			<input type="checkbox" id="shared-pad-id-on"
+				   <c:if test="${not empty authoringForm.dokumaran.sharedPadId}">checked="checked"</c:if>/>
 			<fmt:message key="label.shared.pad.id" />
 		</label>
 	</div>
-	
+
 	<div class="form-group">
 		<form:input path="dokumaran.sharedPadId" cssClass="form-control" id="shared-pad-id" />
 	</div>
 
 </lams:SimplePanel>
 
+<lams:SimplePanel titleKey="label.authoring.advance.time.limit">
+
+	<div class="loffset20">
+		<div class="radio form-inline">
+			<label for="timeLimitNone">
+				<input type="radio" name="timeLimit" value="none" id="timeLimitNone"
+					${authoringForm.dokumaran.relativeTimeLimit eq 0 and authoringForm.dokumaran.absoluteTimeLimit eq 0 ? 'checked' : ''}
+				/>
+				<fmt:message key="label.authoring.advance.time.limit.none" />
+			</label>
+		</div>
+
+		<div class="radio form-inline">
+			<label for="timeLimitRelative">
+				<input type="radio" id="timeLimitRelative" name="timeLimit" value="relative"
+					${authoringForm.dokumaran.relativeTimeLimit > 0 ? 'checked' : ''} />
+				<fmt:message key="label.authoring.advance.time.limit.relative" />&nbsp;
+			</label>
+			<i class="fa fa-question-circle" data-toggle="tooltip" data-placement="right"
+			   title='<fmt:message key="label.authoring.advance.time.limit.relative.tooltip" />'></i>&nbsp;
+			<form:input path="dokumaran.relativeTimeLimit" type="number" min="0" max="999" size="3"
+						id="timeLimitRelativeValue" cssClass="form-control input-sm"/>
+		</div>
+
+		<div class="radio form-inline">
+			<label for="timeLimitAbsolute">
+				<input type="radio" id="timeLimitAbsolute" name="timeLimit" value="absolute"
+					${authoringForm.dokumaran.absoluteTimeLimit > 0 ? 'checked' : ''} />
+				<fmt:message key="label.authoring.advance.time.limit.absolute" />&nbsp;
+			</label>
+			<i class="fa fa-question-circle" data-toggle="tooltip" data-placement="right"
+			   title='<fmt:message key="label.authoring.advance.time.limit.absolute.tooltip" />'></i>&nbsp;
+			<form:input path="dokumaran.absoluteTimeLimit" type="number" min="0" max="999" size="3"
+						id="timeLimitAbsoluteValue" cssClass="form-control input-sm"/>
+		</div>
+	</div>
+</lams:SimplePanel>
+
 <lams:SimplePanel titleKey="label.gallery.walk">
 	<p>
 		<fmt:message key="label.authoring.advance.gallery.walk.info1" />
 	</p>
 	<p>
 		<fmt:message key="label.authoring.advance.gallery.walk.info2" />
 	</p>
-	
+
 	<div class="checkbox">
 		<label for="gallery-walk-enabled">
 			<form:checkbox path="dokumaran.galleryWalkEnabled" id="gallery-walk-enabled" />
 			<fmt:message key="label.authoring.advance.gallery.walk.enabled" />
 		</label>
 	</div>
-	
+
 	<div id="gallery-walk-options" class="loffset10">
 		<div class="checkbox">
 			<label for="gallery-walk-read-only">
 				<form:checkbox path="dokumaran.galleryWalkReadOnly" id="gallery-walk-read-only" />
 				<fmt:message key="label.authoring.advance.gallery.walk.read.only" />
 			</label>
-			<i class="fa fa-question-circle" 
+			<i class="fa fa-question-circle"
 			   data-toggle="tooltip" title="<fmt:message key='label.authoring.advance.gallery.walk.read.only.tooltip' />"></i>
 		</div>
-		
+
 		<div class="form-group">
 			<fmt:message key='label.authoring.advance.gallery.walk.instructions' var="galleryWalkInstructions"/>
-			<form:textarea path="dokumaran.galleryWalkInstructions" cssClass="form-control" rows="3" 
+			<form:textarea path="dokumaran.galleryWalkInstructions" cssClass="form-control" rows="3"
 						   placeholder="${galleryWalkInstructions}" />
 		</div>
-		
+
 	</div>
 </lams:SimplePanel>
 
@@ -126,33 +182,33 @@
 			<fmt:message key="label.authoring.advance.lock.on.finished" />
 		</label>
 	</div>
-	
+
 	<div class="checkbox">
 		<label for="reflect-on">
 			<form:checkbox path="dokumaran.reflectOnActivity" id="reflect-on"/>
 			<fmt:message key="label.authoring.advanced.reflectOnActivity" />
 		</label>
 	</div>
-	
+
 	<div class="form-group">
 		<form:textarea path="dokumaran.reflectInstructions" cssClass="form-control" id="reflect-instructions" rows="3" />
 	</div>
-	
+
 </lams:SimplePanel>
 
 <script type="text/javascript">
 	//automatically turn on refect option if there are text input in refect instruction area
 	$('#reflect-instructions').keyup(function(){
 		$('#reflect-on').prop('checked', !isEmpty($(this).val()));
 	});
-	
+
 	//automatically turn on shared-pad-id-on option if there are text input in shared-pad-id area
 	$('#shared-pad-id').keyup(function(){
 		$('#shared-pad-id-on').prop('checked', !isEmpty($(this).val()));
 	});
-	
+
 	//automatically turn on shared-pad-id-on option if there are text input in shared-pad-id area
 	$('#useSelectLeaderToolOuput').change(function(){
 		$('#allowMultipleLeaders').prop('disabled', !$('#allowMultipleLeaders').prop('disabled'));
 	});
-</script>
+</script>
\ No newline at end of file
Index: lams_tool_doku/web/pages/monitoring/summary.jsp
===================================================================
diff -u -rfc79f9fc1b671f5e2d182b387be8c3987ba73fb3 -reccd6838790a4369b6788e48fb5ae5851622fe35
--- lams_tool_doku/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision fc79f9fc1b671f5e2d182b387be8c3987ba73fb3)
+++ lams_tool_doku/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision eccd6838790a4369b6788e48fb5ae5851622fe35)
@@ -7,7 +7,8 @@
 <c:set var="timeLimitPanelUrl"><lams:LAMSURL/>monitoring/timeLimit.jsp</c:set>
 <c:url var="timeLimitPanelUrl" value="${timeLimitPanelUrl}">
 	<c:param name="toolContentId" value="${dokumaran.contentId}"/>
-	<c:param name="absoluteTimeLimit" value="${dokumaran.absoluteTimeLimitSeconds}"/>
+	<c:param name="absoluteTimeLimitFinish" value="${dokumaran.absoluteTimeLimitFinishSeconds}"/>
+	<c:param name="absoluteTimeLimit" value="${dokumaran.absoluteTimeLimit}"/>
 	<c:param name="relativeTimeLimit" value="${dokumaran.relativeTimeLimit}"/>
 	<c:param name="isTbl" value="${isTbl}" />
 	<c:param name="controllerContext" value="tool/ladoku11/monitoring" />
Index: lams_tool_doku/web/pages/monitoring/summary5.jsp
===================================================================
diff -u -rf16ca0f0c0c23b15e3adc7b098725cd07401b3b8 -reccd6838790a4369b6788e48fb5ae5851622fe35
--- lams_tool_doku/web/pages/monitoring/summary5.jsp	(.../summary5.jsp)	(revision f16ca0f0c0c23b15e3adc7b098725cd07401b3b8)
+++ lams_tool_doku/web/pages/monitoring/summary5.jsp	(.../summary5.jsp)	(revision eccd6838790a4369b6788e48fb5ae5851622fe35)
@@ -6,29 +6,30 @@
 
 <c:set var="timeLimitPanelUrl"><lams:LAMSURL/>monitoring/timeLimit5.jsp</c:set>
 <c:url var="timeLimitPanelUrl" value="${timeLimitPanelUrl}">
-		<c:param name="toolContentId" value="${dokumaran.contentId}"/>
-		<c:param name="absoluteTimeLimit" value="${dokumaran.absoluteTimeLimitSeconds}"/>
-		<c:param name="relativeTimeLimit" value="${dokumaran.relativeTimeLimit}"/>
-		<c:param name="isTbl" value="true" />
-		<c:param name="controllerContext" value="tool/ladoku11/monitoring" />
+	<c:param name="toolContentId" value="${dokumaran.contentId}"/>
+	<c:param name="absoluteTimeLimitFinish" value="${dokumaran.absoluteTimeLimitFinishSeconds}"/>
+	<c:param name="absoluteTimeLimit" value="${dokumaran.absoluteTimeLimit}"/>
+	<c:param name="relativeTimeLimit" value="${dokumaran.relativeTimeLimit}"/>
+	<c:param name="isTbl" value="true" />
+	<c:param name="controllerContext" value="tool/ladoku11/monitoring" />
 </c:url>
-	
+
 <%@ page import="org.lamsfoundation.lams.tool.dokumaran.DokumaranConstants"%>
 
 <lams:css suffix="jquery.jRating"/>
 <link rel="stylesheet" href="${lams}css/jquery.tablesorter.theme.bootstrap.css"/>
 <link rel="stylesheet" href="${lams}css/jquery.tablesorter.pager5.css" />
-	
+
 <style media="screen,projection" type="text/css">
-	 		
+
 	.doku-monitoring-summary .countdown-timeout {
 		color: #FF3333 !important;
 	}
-	
+
 	.doku-monitoring-summary #time-limit-table th {
 		vertical-align: middle;
 	}
-	
+
 	.doku-monitoring-summary #time-limit-table td.centered {
 		text-align: center;
 	}
@@ -43,222 +44,222 @@
 		margin-bottom: 20px;
 		text-align: center;
 	}
-	
+
 	.doku-monitoring-summary #gallery-walk-panel.gallery-walk-panel-ratings {
 		width: 100%;
 	}
-	
+
 	.doku-monitoring-summary #gallery-walk-learner-edit {
 		margin-top: 20px;
 		margin-bottom: 20px;
 	}
-	
+
 	.doku-monitoring-summary #gallery-walk-rating-table th {
 		font-weight: bold;
 		font-style: normal;
 		text-align: center;
 	}
-	
+
 	.doku-monitoring-summary #gallery-walk-rating-table td {
 		text-align: center;
 	}
-	
+
 	.doku-monitoring-summary #gallery-walk-rating-table th:first-child, .doku-monitoring-summary #gallery-walk-rating-table td:first-child {
 		text-align: right;
 	}
-	
+
 	.doku-monitoring-summary .tablesorter tbody > tr > td > div[contenteditable=true]:focus {
-	  outline: #337ab7 2px solid;
+		outline: #337ab7 2px solid;
 	}
-	
+
 	/* We need to overwrite settings coming from main CSS as in Doku monitoring they look different */
-	
+
 	.doku-monitoring-summary .ts-pager {
-	    color: black;
+		color: black;
 	}
-	
+
 	.doku-monitoring-summary .ts-pager .btn {
-	    background-color: #eee;
+		background-color: #eee;
 	}
 	.doku-monitoring-summary .tablesorter tfoot th {
 		background-color: #eee !important;
 	}
-	
+
 	.doku-monitoring-summary .pagesize {
-	    border: black;
-	    background: white;
+		border: black;
+		background: white;
 	}
 </style>
 
 <script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery.plugin.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter.js"></script> 
-<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-widgets.js"></script>  
-<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-pager.js"></script> 
+<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-widgets.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-pager.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-editable.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/jquery.countdown.js"></script> 
+<script type="text/javascript" src="${lams}includes/javascript/jquery.countdown.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/portrait.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/etherpad.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/monitorToolSummaryAdvanced.js" ></script>
 <script type="text/javascript">
 	//var for jquery.jRating.js
 	var pathToImageFolder = "${lams}images/css/",
-		//vars for rating.js
-		AVG_RATING_LABEL = '<fmt:message key="label.average.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param></fmt:message>',
-		YOUR_RATING_LABEL = '<fmt:message key="label.your.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param><fmt:param>@3@</fmt:param></fmt:message>',
-		MAX_RATES = 0,
-		MIN_RATES = 0,
-		LAMS_URL = '${lams}',
-		COUNT_RATED_ITEMS = true,
-		ALLOW_RERATE = false;
-	
+			//vars for rating.js
+			AVG_RATING_LABEL = '<fmt:message key="label.average.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param></fmt:message>',
+			YOUR_RATING_LABEL = '<fmt:message key="label.your.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param><fmt:param>@3@</fmt:param></fmt:message>',
+			MAX_RATES = 0,
+			MIN_RATES = 0,
+			LAMS_URL = '${lams}',
+			COUNT_RATED_ITEMS = true,
+			ALLOW_RERATE = false;
+
 	$(document).ready(function(){
 		// show etherpads only on Group expand
 		$('#doku-monitoring-summary-${sessionMap.toolContentID} .etherpad-collapse').on('show.bs.collapse', function(){
 			var etherpad = $('.etherpad-container', this);
 			if (!etherpad.hasClass('initialised')) {
 				var id = etherpad.attr('id'),
-					groupId = id.substring('etherpad-container-'.length);
+						groupId = id.substring('etherpad-container-'.length);
 				etherpadInitMethods[groupId]();
 			}
 		});
-		
+
 		$("#doku-monitoring-summary-${sessionMap.toolContentID} .fix-faulty-pad").click(function() {
 			var toolSessionId = $(this).data("session-id");
 			var button = $(this);
-			
-	    	//block #buttons
-	    	$(this).block({
-	    		message: '<h4 style="color:#fff";><fmt:message key="label.pad.started.fixing" /></h4>',
-	    		baseZ: 1000000,
-	    		fadeIn: 0,
-	    		css: {
-	    			border: 'none',
-	    		    padding: "2px 7px", 
-	    		    backgroundColor: '#000', 
-	    		    '-webkit-border-radius': '10px', 
-	    		    '-moz-border-radius': '10px', 
-	    		    opacity: .98 ,
-	    		    left: "0px",
-	    		    width: "360px"
-	    		},
-	    		overlayCSS: {
-	    			opacity: 0
-	    		}
-	    	});
-	    	
-	        $.ajax({
-	        	async: true,
-	            url: '<c:url value="/monitoring/fixFaultySession.do"/>',
-	            data : 'toolSessionID=' + toolSessionId,
-	            type: 'post',
-	            success: function (response) {
-	            	button.parent().html('<fmt:message key="label.pad.fixed" />');
-	            	alert('<fmt:message key="label.pad.fixed" />');
-	            },
-	            error: function (request, status, error) {
-	            	button.unblock();
-	                alert(request.responseText);
-	            }
-	       	});
+
+			//block #buttons
+			$(this).block({
+				message: '<h4 style="color:#fff";><fmt:message key="label.pad.started.fixing" /></h4>',
+				baseZ: 1000000,
+				fadeIn: 0,
+				css: {
+					border: 'none',
+					padding: "2px 7px",
+					backgroundColor: '#000',
+					'-webkit-border-radius': '10px',
+					'-moz-border-radius': '10px',
+					opacity: .98 ,
+					left: "0px",
+					width: "360px"
+				},
+				overlayCSS: {
+					opacity: 0
+				}
+			});
+
+			$.ajax({
+				async: true,
+				url: '<c:url value="/monitoring/fixFaultySession.do"/>',
+				data : 'toolSessionID=' + toolSessionId,
+				type: 'post',
+				success: function (response) {
+					button.parent().html('<fmt:message key="label.pad.fixed" />');
+					alert('<fmt:message key="label.pad.fixed" />');
+				},
+				error: function (request, status, error) {
+					button.unblock();
+					alert(request.responseText);
+				}
+			});
 		});
-		
+
 		// marks table for each group
 		var tablesorters = $("#doku-monitoring-summary-${sessionMap.toolContentID} .tablesorter");
 		// intialise tablesorter tables
 		tablesorters.tablesorter({
 			theme: 'bootstrap',
 			headerTemplate : '{content} {icon}',
-		    sortInitialOrder: 'asc',
-		    sortList: [[0]],
-		    widgets: [ "uitheme", "resizable", "editable" ],
-		    headers: { 0: { sorter: true}, 1: { sorter: true}  }, 
-		    sortList : [[0,1]],
-		    showProcessing: false,
-		    widgetOptions: {
-		    	resizable: true,
-		    	
-		    	// only marks is editable
-		        editable_columns       : [1],
-		        editable_enterToAccept : true,          // press enter to accept content, or click outside if false
-		        editable_autoAccept    : false,          // accepts any changes made to the table cell automatically
-		        editable_autoResort    : false,         // auto resort after the content has changed.
-		        editable_validate      : function (text, original, columnIndex) {
-		        	// removing all text produces "&nbsp;", so get rid of it
-		        	text = text ? text.replace(/&nbsp;/g, '').trim() : null;
-		        	// acceptable values are empty text or a number
-		        	return !text || !isNaN(text) ? text : original;
-		        },
-		        editable_selectAll     : function(txt, columnIndex, $element) {
-		          // note $element is the div inside of the table cell, so use $element.closest('td') to get the cell
-		          // only select everthing within the element when the content starts with the letter "B"
-		          return true;
-		        },
-		        editable_wrapContent   : '<div>',       // wrap all editable cell content... makes this widget work in IE, and with autocomplete
-		        editable_trimContent   : true,          // trim content ( removes outer tabs & carriage returns )
-		        editable_editComplete  : 'editComplete' // event fired after the table content has been edited
-		    }
+			sortInitialOrder: 'asc',
+			sortList: [[0]],
+			widgets: [ "uitheme", "resizable", "editable" ],
+			headers: { 0: { sorter: true}, 1: { sorter: true}  },
+			sortList : [[0,1]],
+			showProcessing: false,
+			widgetOptions: {
+				resizable: true,
+
+				// only marks is editable
+				editable_columns       : [1],
+				editable_enterToAccept : true,          // press enter to accept content, or click outside if false
+				editable_autoAccept    : false,          // accepts any changes made to the table cell automatically
+				editable_autoResort    : false,         // auto resort after the content has changed.
+				editable_validate      : function (text, original, columnIndex) {
+					// removing all text produces "&nbsp;", so get rid of it
+					text = text ? text.replace(/&nbsp;/g, '').trim() : null;
+					// acceptable values are empty text or a number
+					return !text || !isNaN(text) ? text : original;
+				},
+				editable_selectAll     : function(txt, columnIndex, $element) {
+					// note $element is the div inside of the table cell, so use $element.closest('td') to get the cell
+					// only select everthing within the element when the content starts with the letter "B"
+					return true;
+				},
+				editable_wrapContent   : '<div>',       // wrap all editable cell content... makes this widget work in IE, and with autocomplete
+				editable_trimContent   : true,          // trim content ( removes outer tabs & carriage returns )
+				editable_editComplete  : 'editComplete' // event fired after the table content has been edited
+			}
 		});
-		
+
 		// update mark on edit
 		tablesorters.each(function(){
-		    // config event variable new in v2.17.6
-		    $(this).children('tbody').on('editComplete', 'td', function(event, config) {
-		      var $this = $(this),
-		        mark = $this.text() ? +$this.text() : null,
-		        toolSessionId = +$this.closest('.tablesorter').attr('toolSessionId'),
-		        userId = +$this.closest('tr').attr('userId'); 
-		        
-		        // max mark is 100
-		        if (mark > 100) {
-		        	mark = 100;
-		        	$this.text(mark);
-		        }
+			// config event variable new in v2.17.6
+			$(this).children('tbody').on('editComplete', 'td', function(event, config) {
+				var $this = $(this),
+						mark = $this.text() ? +$this.text() : null,
+						toolSessionId = +$this.closest('.tablesorter').attr('toolSessionId'),
+						userId = +$this.closest('tr').attr('userId');
 
-		        $.ajax({
-		        	async: true,
-		            url: '<c:url value="/monitoring/updateLearnerMark.do"/>',
-		            data : {
-		            	'toolSessionId' : toolSessionId,
-		            	'userId'		: userId,
-		            	'mark'			: mark,
-		            	'<csrf:tokenname/>' : '<csrf:tokenvalue/>'
-		            },
-		            type: 'post',
-		            error: function (request, status, error) {
-		                alert('<fmt:message key="messsage.monitoring.learner.marks.update.fail" />');
-		            }
-		       	});
-		        
-		    });
+				// max mark is 100
+				if (mark > 100) {
+					mark = 100;
+					$this.text(mark);
+				}
+
+				$.ajax({
+					async: true,
+					url: '<c:url value="/monitoring/updateLearnerMark.do"/>',
+					data : {
+						'toolSessionId' : toolSessionId,
+						'userId'		: userId,
+						'mark'			: mark,
+						'<csrf:tokenname/>' : '<csrf:tokenvalue/>'
+					},
+					type: 'post',
+					error: function (request, status, error) {
+						alert('<fmt:message key="messsage.monitoring.learner.marks.update.fail" />');
+					}
+				});
+
+			});
 		});
 
 		// pager processing
 		tablesorters.each(function() {
 			var toolSessionId = $(this).attr('toolSessionId');
-			
+
 			$(this).tablesorterPager({
 				processAjaxOnInit: true,
 				initialRows: {
-			        total: 10
-			      },
-			    savePages: false, 
-			    container: $(this).find(".ts-pager"),
-		        output: '{startRow} to {endRow} ({totalRows})',
-		        cssPageDisplay: '.pagedisplay',
-		        cssPageSize: '.pagesize',
-		        cssDisabled: 'disabled',
+					total: 10
+				},
+				savePages: false,
+				container: $(this).find(".ts-pager"),
+				output: '{startRow} to {endRow} ({totalRows})',
+				cssPageDisplay: '.pagedisplay',
+				cssPageSize: '.pagesize',
+				cssDisabled: 'disabled',
 				ajaxUrl : "<c:url value='/monitoring/getLearnerMarks.do?{sortList:column}&page={page}&size={size}&toolSessionId='/>" + toolSessionId,
 				ajaxProcessing: function (data, table) {
-			    	if (data && data.hasOwnProperty('rows')) {
-			    		var rows = [],
-			            json = {};
+					if (data && data.hasOwnProperty('rows')) {
+						var rows = [],
+								json = {};
 
-			    		
-			    		for (i = 0; i < data.rows.length; i++){
+
+						for (i = 0; i < data.rows.length; i++){
 							var userData = data.rows[i],
-								isLeader = userData['isLeader'];
-							
+									isLeader = userData['isLeader'];
+
 							rows += '<tr userId="' + userData['userId'] + '" ' + (isLeader ? 'class="info"' : '') + '>';
 
 							rows += '<td style="width: 80%">';
@@ -267,38 +268,49 @@
 								rows += '&nbsp;<i title="<fmt:message key="label.monitoring.team.leader"/>" class="text-primary fa fa-star"></i>';
 							}
 							rows += '</td>';
-														
+
 							rows += '<td>';
 							rows += 	userData['mark'];
 							rows += '</td>';
 
 							rows += '</tr>';
 						}
-			            
+
 						json.total = data.total_rows;
 						json.rows = $(rows);
 						return json;
-			    	}
+					}
 				}
-		  	})
-		   .bind('pagerInitialized pagerComplete', function(event, options){
-			  if ( options.totalRows == 0 ) {
-				  $.tablesorter.showError($(this), '<fmt:message key="messsage.monitoring.learner.marks.no.data"/>');
-			  }
-			});
+			})
+					.bind('pagerInitialized pagerComplete', function(event, options){
+						if ( options.totalRows == 0 ) {
+							$.tablesorter.showError($(this), '<fmt:message key="messsage.monitoring.learner.marks.no.data"/>');
+						}
+					});
 		});
-		
+
 		//insert total learners number taken from the parent tblmonitor.jsp
 		$("#doku-monitoring-summary-${sessionMap.toolContentID} .total-learners-number").text(TOTAL_LESSON_LEARNERS_NUMBER);
 
-		$('#time-limit-panel-placeholder').load('${timeLimitPanelUrl}');
+		openEventSource('<lams:WebAppURL />monitoring/getTimeLimitPanelUpdateFlux.do?toolContentId=${dokumaran.contentId}', 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=${dokumaran.contentId}&absoluteTimeLimitFinish=' + data.absoluteTimeLimitFinish
+					+ '&relativeTimeLimit=' + data.relativeTimeLimit + '&absoluteTimeLimit=' + data.absoluteTimeLimit
+					+ '&isTbl=true&controllerContext=tool/ladoku11/monitoring');
+		});
 	});
-	
+
 	function startGalleryWalk(){
 		if (!confirm('<fmt:message key="monitoring.summary.gallery.walk.start.confirm" />')) {
 			return;
 		}
-		
+
 		$.ajax({
 			'url' : '<c:url value="/monitoring/startGalleryWalk.do"/>',
 			'data': {
@@ -310,12 +322,12 @@
 			}
 		});
 	}
-	
+
 	function finishGalleryWalk(){
 		if (!confirm('<fmt:message key="monitoring.summary.gallery.walk.finish.confirm" />')) {
 			return;
 		}
-		
+
 		$.ajax({
 			'url' : '<c:url value="/monitoring/finishGalleryWalk.do"/>',
 			'data': {
@@ -328,12 +340,12 @@
 		});
 	}
 
-	
+
 	function enableGalleryWalkLearnerEdit(){
 		if (!confirm('<fmt:message key="monitoring.summary.gallery.walk.learner.edit.confirm" />')) {
 			return;
 		}
-		
+
 		$.ajax({
 			'url' : '<c:url value="/monitoring/enableGalleryWalkLearnerEdit.do"/>',
 			'data': {
@@ -349,30 +361,30 @@
 
 	function showChangeLeaderModal(toolSessionId) {
 		$('#doku-monitoring-summary-${sessionMap.toolContentID} #change-leader-modals').empty()
-		.load('<c:url value="/monitoring/displayChangeLeaderForGroupDialogFromActivity.do" />',{
-			toolSessionID : toolSessionId
-		});
+				.load('<c:url value="/monitoring/displayChangeLeaderForGroupDialogFromActivity.do" />',{
+					toolSessionID : toolSessionId
+				});
 	}
 
 	function onChangeLeaderCallback(response, leaderUserId, toolSessionId){
-        if (response.isSuccessful) {
-            $.ajax({
-    			'url' : '<c:url value="/monitoring/changeLeaderForGroup.do"/>',
-    			'type': 'post',
-    			'cache' : 'false',
-    			'data': {
-    				'toolSessionID' : toolSessionId,
-    				'leaderUserId' : leaderUserId,
-    				'<csrf:tokenname/>' : '<csrf:tokenvalue/>'
-    			},
-    			success : function(){
-    				alert("<fmt:message key='label.monitoring.leader.successfully.changed'/>");
-    			},
-    			error : function(){
-    				alert("<fmt:message key='label.monitoring.leader.not.changed'/>");
-        		}
-            });
-        	
+		if (response.isSuccessful) {
+			$.ajax({
+				'url' : '<c:url value="/monitoring/changeLeaderForGroup.do"/>',
+				'type': 'post',
+				'cache' : 'false',
+				'data': {
+					'toolSessionID' : toolSessionId,
+					'leaderUserId' : leaderUserId,
+					'<csrf:tokenname/>' : '<csrf:tokenvalue/>'
+				},
+				success : function(){
+					alert("<fmt:message key='label.monitoring.leader.successfully.changed'/>");
+				},
+				error : function(){
+					alert("<fmt:message key='label.monitoring.leader.not.changed'/>");
+				}
+			});
+
 		} else {
 			alert("<fmt:message key='label.monitoring.leader.not.changed'/>");
 		}
@@ -388,12 +400,12 @@
 	<div class="row mb-3">
 		<div class="col-10 offset-1 pt-1">
 			<h4>
-				<i class="fa fa-users" style="color:gray" ></i> 
-				<fmt:message key="label.attendance"/>: <span>${attemptedLearnersNumber}</span>/<span class="total-learners-number"></span> 
-			</h4> 
-		</div>        
+				<i class="fa fa-users" style="color:gray" ></i>
+				<fmt:message key="label.attendance"/>: <span>${attemptedLearnersNumber}</span>/<span class="total-learners-number"></span>
+			</h4>
+		</div>
 	</div>
-	
+
 	<div class="row mb-3">
 		<div class="col-10 offset-1">
 			<div class="card">
@@ -402,9 +414,9 @@
 			       	<span class="card-title">
 			       		<fmt:message key="label.authoring.basic.description" />
 			     	</span>
-			    </div>
-			
-			    <div id="description-collapse" class="collapse card-body" role="tabpanel" aria-labelledby="description-heading">
+				</div>
+
+				<div id="description-collapse" class="collapse card-body" role="tabpanel" aria-labelledby="description-heading">
 					<c:out value="${dokumaran.description}" escapeXml="false"/>
 				</div>
 			</div>
@@ -415,178 +427,178 @@
 		<div class="col-6 offset-4">
 			<c:if test="${empty summaryList}">
 				<lams:Alert type="info" id="no-session-summary" close="false">
-					 <fmt:message key="message.monitoring.summary.no.session" />
+					<fmt:message key="message.monitoring.summary.no.session" />
 				</lams:Alert>
 			</c:if>
-			
+
 			<!--For release marks feature-->
 			<i class="fa fa-spinner" style="display:none" id="message-area-busy"></i>
 			<div id="message-area"></div>
 		</div>
 	</div>
-	
+
 	<div class="row mb-3">
 		<div class="col-10 offset-1">
 			<c:if test="${not empty summaryList and dokumaran.galleryWalkEnabled}">
 				<div class="card ${dokumaran.galleryWalkFinished and not dokumaran.galleryWalkReadOnly ? 'gallery-walk-panel-ratings' : ''}"
 					 id="gallery-walk-panel">
-				  <div class="card-header">
-				    <h3 class="card-title">
-						<fmt:message key="label.gallery.walk" />&nbsp;
-						<b>
-							<c:choose>
-								<c:when test="${not dokumaran.galleryWalkStarted and not dokumaran.galleryWalkFinished}">
-									<fmt:message key="label.gallery.walk.state.not.started" />
-								</c:when>
-								<c:when test="${dokumaran.galleryWalkStarted and not dokumaran.galleryWalkFinished}">
-									<fmt:message key="label.gallery.walk.state.started" />
-								</c:when>
-								<c:when test="${dokumaran.galleryWalkFinished}">
-									<fmt:message key="label.gallery.walk.state.finished" />
-								</c:when>
-							</c:choose>
-							<c:if test="${dokumaran.galleryWalkEditEnabled}">
-								<fmt:message key="label.gallery.walk.state.learner.edit.enabled" />
-							</c:if>
-						</b>
-					</h3>
-				  </div>
-				  <div class="card-body">
-				   		<button id="gallery-walk-start" type="button"
-						        class="btn btn-primary
+					<div class="card-header">
+						<h3 class="card-title">
+							<fmt:message key="label.gallery.walk" />&nbsp;
+							<b>
+								<c:choose>
+									<c:when test="${not dokumaran.galleryWalkStarted and not dokumaran.galleryWalkFinished}">
+										<fmt:message key="label.gallery.walk.state.not.started" />
+									</c:when>
+									<c:when test="${dokumaran.galleryWalkStarted and not dokumaran.galleryWalkFinished}">
+										<fmt:message key="label.gallery.walk.state.started" />
+									</c:when>
+									<c:when test="${dokumaran.galleryWalkFinished}">
+										<fmt:message key="label.gallery.walk.state.finished" />
+									</c:when>
+								</c:choose>
+								<c:if test="${dokumaran.galleryWalkEditEnabled}">
+									<fmt:message key="label.gallery.walk.state.learner.edit.enabled" />
+								</c:if>
+							</b>
+						</h3>
+					</div>
+					<div class="card-body">
+						<button id="gallery-walk-start" type="button"
+								class="btn btn-primary
 						        	   ${not dokumaran.galleryWalkStarted and not dokumaran.galleryWalkFinished ? '' : 'd-none'}"
-						        onClick="javascript:startGalleryWalk()">
-							<fmt:message key="monitoring.summary.gallery.walk.start" /> 
+								onClick="javascript:startGalleryWalk()">
+							<fmt:message key="monitoring.summary.gallery.walk.start" />
 						</button>
-						
+
 						<button id="gallery-walk-finish" type="button"
-						        class="btn btn-primary ${dokumaran.galleryWalkStarted and not dokumaran.galleryWalkFinished ? '' : 'd-none'}"
-						        onClick="javascript:finishGalleryWalk()">
-							<fmt:message key="monitoring.summary.gallery.walk.finish" /> 
+								class="btn btn-primary ${dokumaran.galleryWalkStarted and not dokumaran.galleryWalkFinished ? '' : 'd-none'}"
+								onClick="javascript:finishGalleryWalk()">
+							<fmt:message key="monitoring.summary.gallery.walk.finish" />
 						</button>
-						
+
 						<br>
-									
+
 						<button id="gallery-walk-learner-edit" type="button"
-						        class="btn btn-secondary ${not dokumaran.galleryWalkEditEnabled and (dokumaran.galleryWalkStarted or dokumaran.galleryWalkFinished) ? '' : 'd-none'}"
-						        onClick="javascript:enableGalleryWalkLearnerEdit()">
-							<fmt:message key="monitoring.summary.gallery.walk.learner.edit" /> 
+								class="btn btn-secondary ${not dokumaran.galleryWalkEditEnabled and (dokumaran.galleryWalkStarted or dokumaran.galleryWalkFinished) ? '' : 'd-none'}"
+								onClick="javascript:enableGalleryWalkLearnerEdit()">
+							<fmt:message key="monitoring.summary.gallery.walk.learner.edit" />
 						</button>
-						
+
 						<c:if test="${dokumaran.galleryWalkFinished and not dokumaran.galleryWalkReadOnly}">
 							<h4 style="text-align: center"><fmt:message key="label.gallery.walk.ratings.header" /></h4>
 							<table id="gallery-walk-rating-table" class="table table-hover table-condensed">
-							  <thead class="thead-light">
-							    <tr>
-							      <th scope="col"><fmt:message key="monitoring.label.group" /></th>
-							      <th scope="col"><fmt:message key="label.rating" /></th>
-							    </tr>
-							  </thead>
-							  <tbody>
+								<thead class="thead-light">
+								<tr>
+									<th scope="col"><fmt:message key="monitoring.label.group" /></th>
+									<th scope="col"><fmt:message key="label.rating" /></th>
+								</tr>
+								</thead>
+								<tbody>
 								<c:forEach var="groupSummary" items="${summaryList}">
 									<tr>
 										<td>${groupSummary.sessionName}</td>
 										<td>
-											<lams:Rating itemRatingDto="${groupSummary.itemRatingDto}" 
+											<lams:Rating itemRatingDto="${groupSummary.itemRatingDto}"
 														 isItemAuthoredByUser="true"
 														 hideCriteriaTitle="true" />
 										</td>
 									</tr>
 								</c:forEach>
-							  </tbody>
+								</tbody>
 							</table>
 						</c:if>
-				  </div>
+					</div>
 				</div>
 			</c:if>
-			
+
 			<c:if test="${sessionMap.isGroupedActivity}">
-				<div class="accordion" id="accordionSessions"> 
-			</c:if>
-			
-			<c:forEach var="groupSummary" items="${summaryList}" varStatus="status">
-				<c:choose>
-					<c:when test="${sessionMap.isGroupedActivity}">		
-					    <div class="accordion-item" >
-					    	  <h2 class="accordion-header" id="heading${groupSummary.sessionId}">
-						    	<button class="accordion-button collapsed" type="button"
-						    			data-bs-toggle="collapse" data-bs-target="#collapse${groupSummary.sessionId}"
-						    			aria-expanded="false">
-						    		<fmt:message key="monitoring.label.group" />&nbsp;${groupSummary.sessionName}
-						    	</button>
-							    <c:if test="${dokumaran.useSelectLeaderToolOuput and groupSummary.numberOfLearners > 0 and not groupSummary.sessionFinished}">
+			<div class="accordion" id="accordionSessions">
+				</c:if>
+
+				<c:forEach var="groupSummary" items="${summaryList}" varStatus="status">
+					<c:choose>
+						<c:when test="${sessionMap.isGroupedActivity}">
+							<div class="accordion-item" >
+							<h2 class="accordion-header" id="heading${groupSummary.sessionId}">
+								<button class="accordion-button collapsed" type="button"
+										data-bs-toggle="collapse" data-bs-target="#collapse${groupSummary.sessionId}"
+										aria-expanded="false">
+									<fmt:message key="monitoring.label.group" />&nbsp;${groupSummary.sessionName}
+								</button>
+								<c:if test="${dokumaran.useSelectLeaderToolOuput and groupSummary.numberOfLearners > 0 and not groupSummary.sessionFinished}">
 									<button type="button" class="btn btn-secondary float-end"
 											onClick="javascript:showChangeLeaderModal(${groupSummary.sessionId})">
 										<fmt:message key='label.monitoring.change.leader'/>
 									</button>
 								</c:if>
-						  	  </h2>
-						  	  
-				        	<div id="collapse${groupSummary.sessionId}" class="accordion-collapse collapse etherpad-collapse" 
-				        	 	role="tabpanel" aria-labelledby="heading${groupSummary.sessionId}">
-					</c:when>
-					<c:when test="${dokumaran.useSelectLeaderToolOuput and groupSummary.numberOfLearners > 0 and not groupSummary.sessionFinished}">
-						<div class="text-end">
-							<button type="button" class="btn btn-secondary" style="margin-bottom: 10px"
-									onClick="javascript:showChangeLeaderModal(${groupSummary.sessionId})">
-								<fmt:message key='label.monitoring.change.leader'/>
-							</button>
-						</div>
-					</c:when>
-				</c:choose>
-				
-				<c:choose>
-					<c:when test="${groupSummary.sessionFaulty}">
-					
-						<div class="faulty-pad-container">
-							<fmt:message key="label.cant.display.faulty.pad" />
-							
-							<a href="#nogo" class="btn btn-default btn-xs fix-faulty-pad" data-session-id="${groupSummary.sessionId}">
-								<fmt:message key="label.recreate.faulty.pad" />
-							</a>
-						</div>
-												
-					</c:when>
-					<c:otherwise>
-						<c:if test="${dokumaran.galleryWalkStarted and not dokumaran.galleryWalkReadOnly}">
-							<lams:Rating itemRatingDto="${groupSummary.itemRatingDto}" isItemAuthoredByUser="true" />
-						</c:if>
-						
-						<lams:Etherpad groupId="${groupSummary.sessionId}" padId="${groupSummary.padId}"
-									   showControls="true" showChat="${dokumaran.showChat}" showOnDemand="${sessionMap.isGroupedActivity}"
-									   heightAutoGrow="true" height="600" />	
-					</c:otherwise>
-				</c:choose>
-				
-			
-				<!-- Editable marks section -->
-				<div class="mt-2">	
-					<h4>
-					   <fmt:message key="label.monitoring.learner.marks.header"/>
-					</h4>
-					<lams:TSTable numColumns="2" dataId='toolSessionId="${groupSummary.sessionId}"'>
-						<th><fmt:message key="label.monitoring.learner.marks.name"/></th>
-						<th><fmt:message key="label.monitoring.learner.marks.mark"/>&nbsp;
-							<small><fmt:message key="label.monitoring.learner.marks.mark.tip"/></small>
-						</th>
-					</lams:TSTable>
-				</div>
-				
+							</h2>
+
+							<div id="collapse${groupSummary.sessionId}" class="accordion-collapse collapse etherpad-collapse"
+							role="tabpanel" aria-labelledby="heading${groupSummary.sessionId}">
+						</c:when>
+						<c:when test="${dokumaran.useSelectLeaderToolOuput and groupSummary.numberOfLearners > 0 and not groupSummary.sessionFinished}">
+							<div class="text-end">
+								<button type="button" class="btn btn-secondary" style="margin-bottom: 10px"
+										onClick="javascript:showChangeLeaderModal(${groupSummary.sessionId})">
+									<fmt:message key='label.monitoring.change.leader'/>
+								</button>
+							</div>
+						</c:when>
+					</c:choose>
+
+					<c:choose>
+						<c:when test="${groupSummary.sessionFaulty}">
+
+							<div class="faulty-pad-container">
+								<fmt:message key="label.cant.display.faulty.pad" />
+
+								<a href="#nogo" class="btn btn-default btn-xs fix-faulty-pad" data-session-id="${groupSummary.sessionId}">
+									<fmt:message key="label.recreate.faulty.pad" />
+								</a>
+							</div>
+
+						</c:when>
+						<c:otherwise>
+							<c:if test="${dokumaran.galleryWalkStarted and not dokumaran.galleryWalkReadOnly}">
+								<lams:Rating itemRatingDto="${groupSummary.itemRatingDto}" isItemAuthoredByUser="true" />
+							</c:if>
+
+							<lams:Etherpad groupId="${groupSummary.sessionId}" padId="${groupSummary.padId}"
+										   showControls="true" showChat="${dokumaran.showChat}" showOnDemand="${sessionMap.isGroupedActivity}"
+										   heightAutoGrow="true" height="600" />
+						</c:otherwise>
+					</c:choose>
+
+
+					<!-- Editable marks section -->
+					<div class="mt-2">
+						<h4>
+							<fmt:message key="label.monitoring.learner.marks.header"/>
+						</h4>
+						<lams:TSTable numColumns="2" dataId='toolSessionId="${groupSummary.sessionId}"'>
+							<th><fmt:message key="label.monitoring.learner.marks.name"/></th>
+							<th><fmt:message key="label.monitoring.learner.marks.mark"/>&nbsp;
+								<small><fmt:message key="label.monitoring.learner.marks.mark.tip"/></small>
+							</th>
+						</lams:TSTable>
+					</div>
+
+					<c:if test="${sessionMap.isGroupedActivity}">
+						</div> <!-- end collapse area  -->
+						</div> <!-- end collapse panel  -->
+					</c:if>
+					${ !sessionMap.isGroupedActivity || ! status.last ? '<div class="mt-3">&nbsp;</div>' :  ''}
+
+				</c:forEach>
+
 				<c:if test="${sessionMap.isGroupedActivity}">
-					</div> <!-- end collapse area  -->
-					</div> <!-- end collapse panel  -->
-				</c:if>
-				${ !sessionMap.isGroupedActivity || ! status.last ? '<div class="mt-3">&nbsp;</div>' :  ''}
-				
-			</c:forEach>
-			
-			<c:if test="${sessionMap.isGroupedActivity}">
-				</div> <!--  end accordianSessions --> 
+			</div> <!--  end accordianSessions -->
 			</c:if>
-				
-			</div>
+
+		</div>
 	</div>
-	
+
 	<div class="row mb-3">
 		<div class="col-10 offset-1">
 			<c:if test="${sessionMap.dokumaran.reflectOnActivity}">
Index: lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r5bc88174180046cd153cfc46a0c8ef13675bd4bf -reccd6838790a4369b6788e48fb5ae5851622fe35
--- lams_tool_scratchie/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 5bc88174180046cd153cfc46a0c8ef13675bd4bf)
+++ lams_tool_scratchie/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision eccd6838790a4369b6788e48fb5ae5851622fe35)
@@ -177,7 +177,12 @@
 label.authoring.advanced.burning.questions = Enable burning questions
 label.burning.questions = Burning questions
 label.burning.question = Burning question?
-label.time.limit = Time limit (minutes)
+label.authoring.advance.time.limit = Time limit duration (minutes)
+label.authoring.advance.time.limit.none = none
+label.authoring.advance.time.limit.relative = relative to from student start
+label.authoring.advance.time.limit.relative.tooltip = Set the duration in minutes that the learners will 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.authoring.advance.time.limit.absolute = for all learners
+label.authoring.advance.time.limit.absolute.tooltip = Set the number of minutes to finish the assessment for all learners. The duration will apply from the moment the first learner starts the assessment.
 label.countdown.time.left = Time left
 label.time.is.over = Time is over. Processing answers...
 label.are.you.ready = You are going to participate in activity that has time limitation. Are you ready to start?
@@ -287,7 +292,6 @@
 label.qb.discrimination.index.tooltip = Discrimination index measures how well a question distinguishes between students with more knowledge or skill from those with less. Values close to +1 indicate that the question does a good job of discriminating between high performers and low performers. Value 0.2 to 1 is considered good for this factor, -0.2 to 0.2 is medium and below -0.2 requires improvement.
 label.median.mark = Median:
 label.modes.mark = Mode:
-label.time.limit.tooltip = Number of minutes that each group will get from the moment the leader enters this activity. Leave it at 0 for no time restrictions.
 label.authoring.advanced.data.import = Data import
 label.authoring.advanced.data.import.tooltip = Imports confidence levels or VSAs responses data from other Assessment activities to display in this activity.
 label.total.1st.attempt.by.team = Sums all the times in which the team answered correctly in their first attempt.
Index: lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r51254ff2df01d1941265996bbc17c7a31f4942ef -reccd6838790a4369b6788e48fb5ae5851622fe35
--- lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 51254ff2df01d1941265996bbc17c7a31f4942ef)
+++ lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision eccd6838790a4369b6788e48fb5ae5851622fe35)
@@ -177,7 +177,12 @@
 label.authoring.advanced.burning.questions = Enable burning questions
 label.burning.questions = Burning questions
 label.burning.question = Burning question?
-label.time.limit = Time limit (minutes)
+label.authoring.advance.time.limit = Time limit duration (minutes)
+label.authoring.advance.time.limit.none = none
+label.authoring.advance.time.limit.relative = relative to from student start
+label.authoring.advance.time.limit.relative.tooltip = Set the duration in minutes that the learners will 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.authoring.advance.time.limit.absolute = for all learners
+label.authoring.advance.time.limit.absolute.tooltip = Set the number of minutes to finish the assessment for all learners. The duration will apply from the moment the first learner starts the assessment.
 label.countdown.time.left = Time left
 label.time.is.over = Time is over. Processing answers...
 label.are.you.ready = You are going to participate in activity that has time limitation. Are you ready to start?
@@ -275,6 +280,9 @@
 label.authoring.advanced.reveal.double.click = Require double click to reveal an answer
 label.learning.reveal.double.click = Note: you need to double click on an answer to reveal its result.
 label.authoring.advanced.reveal.double.click.tooltip = When this option is enabled, leaders will require to double click on an answer in order to reveal the result. This option might be useful for summative assessments.
+label.authoring.advanced.require.all.answers = Require to reveal all correct answers before proceeding
+label.authoring.advanced.require.all.answers.tooltip = When this option is enabled, leaders will require to find all the correct answers in multiple choice questions before they can complete the activity. Otherwise they will be only presented with a warning if no all correct answers are found.
+label.learning.require.all.answers = Make sure you find all the correct answers for multiple choice questions before finishing.
 label.monitoring.change.leader = Change leader
 label.monitoring.leader.successfully.changed = Leader changed
 label.monitoring.leader.not.changed = Leader was not changed
@@ -284,7 +292,6 @@
 label.qb.discrimination.index.tooltip = Discrimination index measures how well a question distinguishes between students with more knowledge or skill from those with less. Values close to +1 indicate that the question does a good job of discriminating between high performers and low performers. Value 0.2 to 1 is considered good for this factor, -0.2 to 0.2 is medium and below -0.2 requires improvement.
 label.median.mark = Median:
 label.modes.mark = Mode:
-label.time.limit.tooltip = Number of minutes that each group will get from the moment the leader enters this activity. Leave it at 0 for no time restrictions.
 label.authoring.advanced.data.import = Data import
 label.authoring.advanced.data.import.tooltip = Imports confidence levels or VSAs responses data from other Assessment activities to display in this activity.
 label.total.1st.attempt.by.team = Sums all the times in which the team answered correctly in their first attempt.
@@ -298,3 +305,5 @@
 label.prevent.learner.autosave.mutliple.tabs = You seem to have two LAMS tabs open for this exam. Please close one of them. Otherwise, answers will not be recorder properly and affect your score.
 label.exact.match = Learner answer must exactly match expected answer
 label.burning.questions.none = No burning questions yet...
+label.questions.choice.collection.new.option = <Add new collection>
+label.questions.choice.collection.new.prompt = Enter a name for the new collection:
\ No newline at end of file
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
===================================================================
diff -u -r714c2ac0cb292aa17fa8457442df8c4d6d2a13a9 -reccd6838790a4369b6788e48fb5ae5851622fe35
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java	(.../ScratchieConstants.java)	(revision 714c2ac0cb292aa17fa8457442df8c4d6d2a13a9)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java	(.../ScratchieConstants.java)	(revision eccd6838790a4369b6788e48fb5ae5851622fe35)
@@ -198,4 +198,7 @@
     
     public static final String BURNING_QUESTIONS_UPDATED_SINK_NAME = "scratchie burning questions updated";
     public static final String BURNING_QUESTIONS_UPDATED_FLUX_NAME = "scratchie burning questions updated";
-}
+
+    public static final String TIME_LIMIT_PANEL_UPDATE_SINK_NAME = "scratchie time limit panel updated";
+    public static final String TIME_LIMIT_PANEL_UPDATE_FLUX_NAME = "scratchie time limit panel updated";
+}
\ No newline at end of file
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20230621.sql
===================================================================
diff -u
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20230621.sql	(revision 0)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20230621.sql	(revision eccd6838790a4369b6788e48fb5ae5851622fe35)
@@ -0,0 +1,15 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+SET FOREIGN_KEY_CHECKS=0;
+-- Put all sql statements below here
+
+-- LDEV-5401 Add learner-triggered absolute time limit
+ALTER TABLE tl_lascrt11_scratchie RENAME COLUMN absolute_time_limit TO absolute_time_limit_finish;
+ALTER TABLE tl_lascrt11_scratchie ADD COLUMN absolute_time_limit SMALLINT UNSIGNED NOT NULL DEFAULT '0' AFTER relative_time_limit;
+
+-- Put all sql statements above here
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
+SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
===================================================================
diff -u -r2265c2e9ad0c8a27f390fcfc67769877b8c651d9 -reccd6838790a4369b6788e48fb5ae5851622fe35
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java	(.../Scratchie.java)	(revision 2265c2e9ad0c8a27f390fcfc67769877b8c651d9)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java	(.../Scratchie.java)	(revision eccd6838790a4369b6788e48fb5ae5851622fe35)
@@ -107,8 +107,11 @@
     private int relativeTimeLimit;
 
     @Column(name = "absolute_time_limit")
-    private LocalDateTime absoluteTimeLimit;
+    private int absoluteTimeLimit;
 
+    @Column(name = "absolute_time_limit_finish")
+    private LocalDateTime absoluteTimeLimitFinish;
+
     @Column(name = "double_click")
     private boolean revealOnDoubleClick;
 
@@ -154,7 +157,7 @@
 	try {
 	    scratchie = (Scratchie) super.clone();
 	    scratchie.setUid(null);
-	    scratchie.setAbsoluteTimeLimit(null);
+	    scratchie.setAbsoluteTimeLimitFinish(null);
 	    if (scratchieItems != null) {
 		Iterator<ScratchieItem> iter = scratchieItems.iterator();
 		Set<ScratchieItem> set = new TreeSet<>();
@@ -166,8 +169,6 @@
 		}
 		scratchie.scratchieItems = set;
 	    }
-
-	    scratchie.setAbsoluteTimeLimit(null);
 	} catch (CloneNotSupportedException e) {
 	    log.error("When clone " + Scratchie.class + " failed");
 	}
@@ -212,9 +213,9 @@
     // **********************************************************
     // get/set methods
     // **********************************************************
+
     /**
      * Returns the object's creation date
-     *
      */
     public Date getCreated() {
 	return created;
@@ -231,7 +232,6 @@
      * Returns the object's date of last update
      *
      * @return date updated
-     *
      */
     public Date getUpdated() {
 	return updated;
@@ -281,7 +281,7 @@
 
     /**
      * @param title
-     *            The title to set.
+     * 	The title to set.
      */
     public void setTitle(String title) {
 	this.title = title;
@@ -382,24 +382,34 @@
 
     /**
      * @param timeLimit
-     *            the time limitation, that students have to complete an attempt.
+     * 	the time limitation, that students have to complete an attempt.
      */
     public void setRelativeTimeLimit(int timeLimit) {
 	this.relativeTimeLimit = timeLimit;
     }
 
-    public LocalDateTime getAbsoluteTimeLimit() {
+    public int getAbsoluteTimeLimit() {
 	return absoluteTimeLimit;
     }
 
-    public void setAbsoluteTimeLimit(LocalDateTime absoluteTimeLimit) {
+    public void setAbsoluteTimeLimit(int absoluteTimeLimit) {
 	this.absoluteTimeLimit = absoluteTimeLimit;
     }
 
-    public Long getAbsoluteTimeLimitSeconds() {
-	return absoluteTimeLimit == null ? null : absoluteTimeLimit.atZone(ZoneId.systemDefault()).toEpochSecond();
+    public LocalDateTime getAbsoluteTimeLimitFinish() {
+	return absoluteTimeLimitFinish;
     }
 
+    public void setAbsoluteTimeLimitFinish(LocalDateTime absoluteTimeLimitFinish) {
+	this.absoluteTimeLimitFinish = absoluteTimeLimitFinish;
+    }
+
+    public Long getAbsoluteTimeLimitFinishSeconds() {
+	return absoluteTimeLimitFinish == null
+		? null
+		: absoluteTimeLimitFinish.atZone(ZoneId.systemDefault()).toEpochSecond();
+    }
+
     public boolean isRevealOnDoubleClick() {
 	return revealOnDoubleClick;
     }
@@ -432,7 +442,7 @@
 
     /**
      * @param confidenceLevelsActivityUiid
-     *            preceding activity that should be queried for confidence levels
+     * 	preceding activity that should be queried for confidence levels
      */
     public void setConfidenceLevelsActivityUiid(Integer confidenceLevelsActivityUiid) {
 	this.confidenceLevelsActivityUiid = confidenceLevelsActivityUiid;
@@ -459,7 +469,7 @@
 
     /**
      * @param activityUiidProvidingVsaAnswers
-     *            preceding activity that should be queried for VSA answers
+     * 	preceding activity that should be queried for VSA answers
      */
     public void setActivityUiidProvidingVsaAnswers(Integer activityUiidProvidingVsaAnswers) {
 	this.activityUiidProvidingVsaAnswers = activityUiidProvidingVsaAnswers;
@@ -486,4 +496,4 @@
     public void setShowScrachiesInResults(boolean showScrachiesInResults) {
 	this.showScrachiesInResults = showScrachiesInResults;
     }
-}
+}
\ No newline at end of file
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
===================================================================
diff -u -r5bc88174180046cd153cfc46a0c8ef13675bd4bf -reccd6838790a4369b6788e48fb5ae5851622fe35
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	(.../ScratchieServiceImpl.java)	(revision 5bc88174180046cd153cfc46a0c8ef13675bd4bf)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	(.../ScratchieServiceImpl.java)	(revision eccd6838790a4369b6788e48fb5ae5851622fe35)
@@ -116,6 +116,7 @@
 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.CommonConstants;
 import org.lamsfoundation.lams.util.FileUtil;
 import org.lamsfoundation.lams.util.JsonUtil;
 import org.lamsfoundation.lams.util.MessageService;
@@ -126,6 +127,7 @@
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.lamsfoundation.lams.util.hibernate.HibernateSessionManager;
 
 /**
  * @author Andrey Balan
@@ -186,6 +188,19 @@
 	FluxRegistry.initFluxMap(ScratchieConstants.BURNING_QUESTIONS_UPDATED_FLUX_NAME,
 		ScratchieConstants.BURNING_QUESTIONS_UPDATED_SINK_NAME, null, toolContentId -> "doRefresh",
 		FluxMap.STANDARD_THROTTLE, FluxMap.STANDARD_TIMEOUT);
+
+	FluxRegistry.initFluxMap(ScratchieConstants.TIME_LIMIT_PANEL_UPDATE_FLUX_NAME,
+		ScratchieConstants.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);
     }
 
     // *******************************************************************************
@@ -376,6 +391,18 @@
 
     @Override
     public LocalDateTime launchTimeLimit(long toolContentId, int userId) {
+	Scratchie scratchie = getScratchieByContentId(toolContentId);
+	int learnersStarted = scratchieUserDao.countUsersByContentId(toolContentId);
+	if (learnersStarted == 1 && scratchie.getRelativeTimeLimit() == 0 && scratchie.getAbsoluteTimeLimit() > 0
+		&& scratchie.getAbsoluteTimeLimitFinish() == null) {
+	    scratchie.setAbsoluteTimeLimitFinish(LocalDateTime.now().plusMinutes(scratchie.getAbsoluteTimeLimit()));
+	    scratchie.setAbsoluteTimeLimit(0);
+	    scratchieDao.saveObject(scratchie);
+
+	    FluxRegistry.emit(CommonConstants.ACTIVITY_TIME_LIMIT_CHANGED_SINK_NAME, Set.of(toolContentId));
+	    FluxRegistry.emit(ScratchieConstants.TIME_LIMIT_PANEL_UPDATE_SINK_NAME, toolContentId);
+	}
+
 	ScratchieUser user = getUserByUserIDAndContentID(Integer.valueOf(userId).longValue(), toolContentId);
 	if (user == null) {
 	    return null;
@@ -2568,6 +2595,16 @@
 	jsonCommand.put("hookTrigger", "scratchie-leader-change-refresh-" + toolSessionId);
 	learnerService.createCommandForLearners(scratchie.getContentId(), userIds, jsonCommand.toString());
     }
+
+    private ObjectNode getTimeLimitSettingsJson(long toolContentId) {
+	ObjectNode timeLimitSettings = JsonNodeFactory.instance.objectNode();
+	Scratchie scratchie = getScratchieByContentId(toolContentId);
+	timeLimitSettings.put("relativeTimeLimit", scratchie.getRelativeTimeLimit());
+	timeLimitSettings.put("absoluteTimeLimit", scratchie.getAbsoluteTimeLimit());
+	timeLimitSettings.put("absoluteTimeLimitFinish", scratchie.getAbsoluteTimeLimitFinishSeconds());
+	return timeLimitSettings;
+    }
+
     // *****************************************************************************
     // set methods for Spring Bean
     // *****************************************************************************
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
===================================================================
diff -u -rb51fd1534812233131727a497422305bfad3d6c8 -reccd6838790a4369b6788e48fb5ae5851622fe35
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java	(.../LearningController.java)	(revision b51fd1534812233131727a497422305bfad3d6c8)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java	(.../LearningController.java)	(revision eccd6838790a4369b6788e48fb5ae5851622fe35)
@@ -251,7 +251,8 @@
 	}
 
 	// check time limits
-	if ((scratchie.getRelativeTimeLimit() != 0 || scratchie.getAbsoluteTimeLimit() != null) && !mode.isTeacher()) {
+	if ((scratchie.getRelativeTimeLimit() != 0 || scratchie.getAbsoluteTimeLimit() != 0
+		|| scratchie.getAbsoluteTimeLimitFinish() != null) && !mode.isTeacher()) {
 
 	    // show waitForLeaderLaunchTimeLimit page if the leader hasn't started activity
 	    if (!isUserLeader && toolSession.getTimeLimitLaunchedDate() == null) {
@@ -300,8 +301,8 @@
 	sessionMap.put(ScratchieConstants.ATTR_IS_WAITING_FOR_LEADER_TO_SUBMIT_NOTEBOOK,
 		isWaitingForLeaderToSubmitNotebook);
 
-	boolean questionEtherpadEnabled = scratchie.isQuestionEtherpadEnabled()
-		&& StringUtils.isNotBlank(Configuration.get(ConfigurationKeys.ETHERPAD_API_KEY));
+	boolean questionEtherpadEnabled = scratchie.isQuestionEtherpadEnabled() && StringUtils.isNotBlank(
+		Configuration.get(ConfigurationKeys.ETHERPAD_API_KEY));
 	request.setAttribute(ScratchieConstants.ATTR_IS_QUESTION_ETHERPAD_ENABLED, questionEtherpadEnabled);
 	if (questionEtherpadEnabled && scratchieService.isGroupedActivity(scratchie.getContentId())) {
 	    // get all users from the group, even if they did not reach the Scratchie yet
@@ -354,8 +355,8 @@
 		// find corresponding burningQuestion
 		String question = "";
 		for (ScratchieBurningQuestion burningQuestion : burningQuestions) {
-		    if (!burningQuestion.isGeneralQuestion()
-			    && burningQuestion.getScratchieItem().getUid().equals(item.getUid())) {
+		    if (!burningQuestion.isGeneralQuestion() && burningQuestion.getScratchieItem().getUid()
+			    .equals(item.getUid())) {
 			question = burningQuestion.getQuestion();
 			break;
 		    }
@@ -458,7 +459,8 @@
 	for (ScratchieItem itemIter : items) {
 	    if (itemIter.getUid().equals(itemUid)) {
 		for (OptionDTO optionDto : itemIter.getOptionDtos()) {
-		    boolean isAnswerMatched = isCaseSensitive ? optionDto.getAnswer().equals(answer)
+		    boolean isAnswerMatched = isCaseSensitive
+			    ? optionDto.getAnswer().equals(answer)
 			    : optionDto.getAnswer().equalsIgnoreCase(answer);
 		    if (isAnswerMatched) {
 			loggedAnswerHash = optionDto.getAnswer().hashCode();
@@ -534,8 +536,8 @@
     public String showResults(HttpServletRequest request) throws ScratchieApplicationException, IOException {
 	SessionMap<String, Object> sessionMap = getSessionMap(request);
 	boolean isReflectOnActivity = (Boolean) sessionMap.get(ScratchieConstants.ATTR_REFLECTION_ON);
-	boolean isBurningQuestionsEnabled = (Boolean) sessionMap
-		.get(ScratchieConstants.ATTR_IS_BURNING_QUESTIONS_ENABLED);
+	boolean isBurningQuestionsEnabled = (Boolean) sessionMap.get(
+		ScratchieConstants.ATTR_IS_BURNING_QUESTIONS_ENABLED);
 
 	final Long toolSessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID);
 	ScratchieSession toolSession = scratchieService.getScratchieSessionBySessionId(toolSessionId);
@@ -579,8 +581,8 @@
 
 	// display other groups' notebooks
 	if (isReflectOnActivity) {
-	    List<ReflectDTO> reflections = scratchieService
-		    .getReflectionList(toolSession.getScratchie().getContentId());
+	    List<ReflectDTO> reflections = scratchieService.getReflectionList(
+		    toolSession.getScratchie().getContentId());
 
 	    // remove current session leader reflection
 	    Iterator<ReflectDTO> refIterator = reflections.iterator();
@@ -616,12 +618,13 @@
     @RequestMapping("/editBurningQuestion")
     @ResponseStatus(HttpStatus.OK)
     private void editBurningQuestion(HttpServletRequest request) {
-	if (StringUtils.isEmpty(request.getParameter(ScratchieConstants.ATTR_ITEM_UID))
-		|| StringUtils.isEmpty(request.getParameter(ScratchieConstants.PARAM_SESSION_ID))) {
+	if (StringUtils.isEmpty(request.getParameter(ScratchieConstants.ATTR_ITEM_UID)) || StringUtils.isEmpty(
+		request.getParameter(ScratchieConstants.PARAM_SESSION_ID))) {
 	    return;
 	}
 
-	Long itemUid = WebUtil.readLongParam(request, ScratchieConstants.ATTR_ITEM_UID) == 0 ? null
+	Long itemUid = WebUtil.readLongParam(request, ScratchieConstants.ATTR_ITEM_UID) == 0
+		? null
 		: WebUtil.readLongParam(request, ScratchieConstants.ATTR_ITEM_UID);
 	Long sessionId = WebUtil.readLongParam(request, ScratchieConstants.PARAM_SESSION_ID);
 	String question = request.getParameter(ScratchieConstants.ATTR_BURNING_QUESTION_PREFIX);
@@ -729,8 +732,8 @@
 	for (ScratchieItem item : items) {
 	    final Long itemUid = item.getUid();
 
-	    final String burningQuestion = request
-		    .getParameter(ScratchieConstants.ATTR_BURNING_QUESTION_PREFIX + itemUid);
+	    final String burningQuestion = request.getParameter(
+		    ScratchieConstants.ATTR_BURNING_QUESTION_PREFIX + itemUid);
 	    if (StringUtils.isNotBlank(burningQuestion)) {
 		// update question in sessionMap
 		item.setBurningQuestion(burningQuestion);
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java
===================================================================
diff -u -r2bc8f0c2f65f02cb65aa7e90d0bbb612494a4588 -reccd6838790a4369b6788e48fb5ae5851622fe35
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java	(.../LearningWebsocketServer.java)	(revision 2bc8f0c2f65f02cb65aa7e90d0bbb612494a4588)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java	(.../LearningWebsocketServer.java)	(revision eccd6838790a4369b6788e48fb5ae5851622fe35)
@@ -106,8 +106,9 @@
 	Scratchie scratchie = scratchieService.getScratchieByContentId(toolContentId);
 	TimeCache existingTimeSettings = new TimeCache();
 
-	existingTimeSettings.absoluteTimeLimitFinish = scratchie.getAbsoluteTimeLimit();
+	existingTimeSettings.absoluteTimeLimitFinish = scratchie.getAbsoluteTimeLimitFinish();
 	existingTimeSettings.relativeTimeLimit = scratchie.getRelativeTimeLimit() * 60;
+	existingTimeSettings.absoluteTimeLimit = scratchie.getAbsoluteTimeLimit() * 60;
 	existingTimeSettings.timeLimitAdjustment = new HashMap<>();
 
 	Map<Long, LocalDateTime> sessionLaunchDates = new HashMap<>();
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
===================================================================
diff -u -rf05bad0f63a5e9515f10dc19d40bfdd26195ff9f -reccd6838790a4369b6788e48fb5ae5851622fe35
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision f05bad0f63a5e9515f10dc19d40bfdd26195ff9f)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision eccd6838790a4369b6788e48fb5ae5851622fe35)
@@ -47,6 +47,7 @@
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.flux.FluxRegistry;
 import org.lamsfoundation.lams.qb.dto.QbStatsActivityDTO;
 import org.lamsfoundation.lams.qb.service.IQbService;
 import org.lamsfoundation.lams.tool.scratchie.ScratchieConstants;
@@ -64,13 +65,7 @@
 import org.lamsfoundation.lams.tool.scratchie.service.IScratchieService;
 import org.lamsfoundation.lams.tool.scratchie.util.ScratchieItemComparator;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
-import org.lamsfoundation.lams.util.AlphanumComparator;
-import org.lamsfoundation.lams.util.Configuration;
-import org.lamsfoundation.lams.util.ConfigurationKeys;
-import org.lamsfoundation.lams.util.DateUtil;
-import org.lamsfoundation.lams.util.FileUtil;
-import org.lamsfoundation.lams.util.JsonUtil;
-import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.util.*;
 import org.lamsfoundation.lams.util.excel.ExcelSheet;
 import org.lamsfoundation.lams.util.excel.ExcelUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
@@ -178,8 +173,8 @@
 	// escape JS sensitive characters in option descriptions
 	for (GroupSummary summary : summaryList) {
 	    for (OptionDTO optionDto : summary.getOptionDtos()) {
-		String escapedAnswer = StringEscapeUtils.escapeJavaScript(optionDto.getAnswer()).replace("\\r\\n",
-			"<br>");
+		String escapedAnswer = StringEscapeUtils.escapeJavaScript(optionDto.getAnswer())
+			.replace("\\r\\n", "<br>");
 		optionDto.setAnswer(escapedAnswer);
 	    }
 	}
@@ -190,9 +185,9 @@
 
     @RequestMapping(path = "/saveUserMark", method = RequestMethod.POST)
     private String saveUserMark(HttpServletRequest request) {
-	if ((request.getParameter(ScratchieConstants.PARAM_NOT_A_NUMBER) == null)
-		&& !StringUtils.isEmpty(request.getParameter(ScratchieConstants.ATTR_USER_ID))
-		&& !StringUtils.isEmpty(request.getParameter(ScratchieConstants.PARAM_SESSION_ID))) {
+	if ((request.getParameter(ScratchieConstants.PARAM_NOT_A_NUMBER) == null) && !StringUtils.isEmpty(
+		request.getParameter(ScratchieConstants.ATTR_USER_ID)) && !StringUtils.isEmpty(
+		request.getParameter(ScratchieConstants.PARAM_SESSION_ID))) {
 
 	    Long userId = WebUtil.readLongParam(request, ScratchieConstants.ATTR_USER_ID);
 	    Long sessionId = WebUtil.readLongParam(request, ScratchieConstants.PARAM_SESSION_ID);
@@ -309,21 +304,32 @@
     @RequestMapping(path = "/updateTimeLimit", method = RequestMethod.POST)
     @ResponseStatus(HttpStatus.OK)
     public void updateTimeLimit(@RequestParam(name = AttributeNames.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) {
 	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");
 	}
 
 	Scratchie scratchie = scratchieService.getScratchieByContentId(toolContentId);
 	scratchie.setRelativeTimeLimit(relativeTimeLimit);
+	scratchie.setAbsoluteTimeLimit(absoluteTimeLimit);
 	// set time limit as seconds from start of epoch, using current server time zone
-	scratchie.setAbsoluteTimeLimit(absoluteTimeLimit == null ? null
-		: LocalDateTime.ofEpochSecond(absoluteTimeLimit, 0, OffsetDateTime.now().getOffset()));
+	scratchie.setAbsoluteTimeLimitFinish(absoluteTimeLimitFinish == null
+		? null
+		: LocalDateTime.ofEpochSecond(absoluteTimeLimitFinish, 0, OffsetDateTime.now().getOffset()));
+
+	// update monitoring UI where time limits are reflected on dashboard
+	FluxRegistry.emit(CommonConstants.ACTIVITY_TIME_LIMIT_CHANGED_SINK_NAME, Set.of(toolContentId));
+	FluxRegistry.emit(ScratchieConstants.TIME_LIMIT_PANEL_UPDATE_SINK_NAME, toolContentId);
 	scratchieService.saveOrUpdateScratchie(scratchie);
     }
 
@@ -376,6 +382,8 @@
 	ScratchieSession session = scratchieService.getScratchieSessionBySessionId(Long.valueOf(itemIdParts[1]));
 	session.setTimeLimitAdjustment(adjustment);
 	scratchieService.saveOrUpdateScratchieSession(session);
+
+	FluxRegistry.emit(ScratchieConstants.TIME_LIMIT_PANEL_UPDATE_SINK_NAME, session.getScratchie().getContentId());
     }
 
     @RequestMapping(path = "/displayChangeLeaderForGroupDialogFromActivity")
@@ -412,8 +420,8 @@
 
 	    for (BurningQuestionDTO burningQuestionDto : burningQuestionItemDto.getBurningQuestionDtos()) {
 
-		String escapedBurningQuestion = StringEscapeUtils
-			.unescapeJavaScript(burningQuestionDto.getEscapedBurningQuestion());
+		String escapedBurningQuestion = StringEscapeUtils.unescapeJavaScript(
+			burningQuestionDto.getEscapedBurningQuestion());
 		burningQuestionDto.setEscapedBurningQuestion(escapedBurningQuestion);
 
 		String sessionName = StringEscapeUtils.unescapeJavaScript(burningQuestionDto.getSessionName());
@@ -428,4 +436,4 @@
 	    });
 	}
     }
-}
+}
\ No newline at end of file
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
===================================================================
diff -u -r048fa3b44bb7c131b7db3c4fe031230d20435678 -reccd6838790a4369b6788e48fb5ae5851622fe35
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java	(.../TblMonitorController.java)	(revision 048fa3b44bb7c131b7db3c4fe031230d20435678)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java	(.../TblMonitorController.java)	(revision eccd6838790a4369b6788e48fb5ae5851622fe35)
@@ -163,6 +163,13 @@
 	return FluxRegistry.get(ScratchieConstants.BURNING_QUESTIONS_UPDATED_FLUX_NAME, 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 FluxRegistry.get(ScratchieConstants.TIME_LIMIT_PANEL_UPDATE_FLUX_NAME, toolContentId);
+    }
+
     /**
      * Exports tool results into excel.
      *
@@ -258,4 +265,4 @@
 	request.setAttribute("scratchieItems", scratchieItems);
 	return "pages/tblmonitoring/teams";
     }
-}
+}
\ No newline at end of file
Index: lams_tool_scratchie/web/pages/authoring/advance.jsp
===================================================================
diff -u -r2265c2e9ad0c8a27f390fcfc67769877b8c651d9 -reccd6838790a4369b6788e48fb5ae5851622fe35
--- lams_tool_scratchie/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 2265c2e9ad0c8a27f390fcfc67769877b8c651d9)
+++ lams_tool_scratchie/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision eccd6838790a4369b6788e48fb5ae5851622fe35)
@@ -5,63 +5,88 @@
 <c:set var="activitiesProvidingVsaAnswers" value="${sessionMap.activitiesProvidingVsaAnswers}" />
 
 <script lang="javascript">
-	$(document).ready(function(){
-		$("#display-confidence-levels-activities").click(function() {
-			var disabled = !$(this).is(':checked');
-			$("#confidence-levels-activity").prop("disabled", disabled);
-			
-			var confidenceLevelsAnonymousCheckbox = $("#confidence-levels-anonymous").prop('disabled', disabled).closest('.checkbox');
-			if (disabled) {
-				confidenceLevelsAnonymousCheckbox.slideUp();
-			} else {
-				confidenceLevelsAnonymousCheckbox.slideDown();
-			}
-		});
-		<c:if test="${authoringForm.scratchie.confidenceLevelsActivityUiid == null}">
-			$("#confidence-levels-activity").prop('disabled', true);
-		</c:if>
-		
-		if (!$("#display-confidence-levels-activities").is(':checked')) {
-			$("#confidence-levels-anonymous").prop('disabled', true).closest('.checkbox').hide();
-		}
-		
-		
-		$("#display-activities-providing-vsa-answers").click(function() {
-			$("#activity-providing-vsa-answers").prop("disabled", !$(this).is(':checked'));
-		});
-		<c:if test="${authoringForm.scratchie.activityUiidProvidingVsaAnswers == null}">$("#activity-providing-vsa-answers").prop('disabled','disabled'); </c:if>
-		
-		$("#overwrite-preset-marks").click(function() {
-			$("#preset-marks").prop("disabled", !$(this).is(':checked'));
-		});
-		<c:choose>
-			<c:when test="${sessionMap.isPresetMarksOverwritten}">
-				$("#collapseAdvanced").collapse("show");
-			</c:when>
-			<c:otherwise>
-				$("#preset-marks").val("${sessionMap.defaultPresetMarks}"); 
-				$("#preset-marks").prop('disabled','disabled');
-			</c:otherwise>
-		</c:choose>
+    $(document).ready(function(){
+        $("#display-confidence-levels-activities").click(function() {
+            var disabled = !$(this).is(':checked');
+            $("#confidence-levels-activity").prop("disabled", disabled);
 
-		var discussionSentimentCheckbox = $('#discussion-sentiment-enabled'),
-			burningQuestionsCheckbox = $('#burning-questions-enabled').click(function(){
-				var disabled = !$(this).is(':checked');
-				if (disabled) {
-					discussionSentimentCheckbox.slideUp();
-				} else {
-					discussionSentimentCheckbox.slideDown();
-				}
-		});
+            var confidenceLevelsAnonymousCheckbox = $("#confidence-levels-anonymous").prop('disabled', disabled).closest('.checkbox');
+            if (disabled) {
+                confidenceLevelsAnonymousCheckbox.slideUp();
+            } else {
+                confidenceLevelsAnonymousCheckbox.slideDown();
+            }
+        });
+        <c:if test="${authoringForm.scratchie.confidenceLevelsActivityUiid == null}">
+        $("#confidence-levels-activity").prop('disabled', true);
+        </c:if>
 
-		if (!burningQuestionsCheckbox.is(':checked')) {
-			discussionSentimentCheckbox.prop('checked', false).hide();
-		}
-	});
+        if (!$("#display-confidence-levels-activities").is(':checked')) {
+            $("#confidence-levels-anonymous").prop('disabled', true).closest('.checkbox').hide();
+        }
+
+
+        $("#display-activities-providing-vsa-answers").click(function() {
+            $("#activity-providing-vsa-answers").prop("disabled", !$(this).is(':checked'));
+        });
+        <c:if test="${authoringForm.scratchie.activityUiidProvidingVsaAnswers == null}">$("#activity-providing-vsa-answers").prop('disabled','disabled'); </c:if>
+
+        $("#overwrite-preset-marks").click(function() {
+            $("#preset-marks").prop("disabled", !$(this).is(':checked'));
+        });
+        <c:choose>
+        <c:when test="${sessionMap.isPresetMarksOverwritten}">
+        $("#collapseAdvanced").collapse("show");
+        </c:when>
+        <c:otherwise>
+        $("#preset-marks").val("${sessionMap.defaultPresetMarks}");
+        $("#preset-marks").prop('disabled','disabled');
+        </c:otherwise>
+        </c:choose>
+
+        var discussionSentimentCheckbox = $('#discussion-sentiment-enabled'),
+            burningQuestionsCheckbox = $('#burning-questions-enabled').click(function(){
+                var disabled = !$(this).is(':checked');
+                if (disabled) {
+                    discussionSentimentCheckbox.slideUp();
+                } else {
+                    discussionSentimentCheckbox.slideDown();
+                }
+            });
+
+        if (!burningQuestionsCheckbox.is(':checked')) {
+            discussionSentimentCheckbox.prop('checked', false).hide();
+        }
+
+        // time limit various options functionality
+        $('input[name="timeLimit"]').change(function(){
+            let timeLimitTypeNone = $('#timeLimitNone'),
+                timeLimitTypeRelative = $('#timeLimitRelative'),
+                timeLimitTypeRelativeValue = $('#timeLimitRelativeValue'),
+                timeLimitTypeAbsolute = $('#timeLimitAbsolute'),
+                timeLimitTypeAbsoluteValue = $('#timeLimitAbsoluteValue');
+
+            if (timeLimitTypeNone.prop('checked')) {
+                timeLimitTypeRelativeValue.prop('disabled', true).val(0);
+                timeLimitTypeAbsoluteValue.prop('disabled', true).val(0);
+                return;
+            }
+            if (timeLimitTypeRelative.prop('checked')) {
+                timeLimitTypeRelativeValue.prop('disabled', false);
+                timeLimitTypeAbsoluteValue.prop('disabled', true).val(0);
+                return;
+            }
+            if (timeLimitTypeAbsolute.prop('checked')) {
+                timeLimitTypeRelativeValue.prop('disabled', true).val(0);
+                timeLimitTypeAbsoluteValue.prop('disabled', false);
+                return;
+            }
+        }).first().change();
+    });
 </script>
 
 <lams:SimplePanel titleKey="label.scratchie.options">
-    
+
     <div class="row">
         <div class="col-sm-6">
 
@@ -72,12 +97,12 @@
                 </label>
             </div>
 
-			<div class="checkbox loffset20">
+            <div class="checkbox loffset20">
                 <label for="discussion-sentiment-enabled">
                     <form:checkbox path="scratchie.discussionSentimentEnabled" id="discussion-sentiment-enabled"/>
                     <fmt:message key="label.authoring.advanced.discussion" />
                 </label>
-				<i class="fa fa-question-circle" data-toggle="tooltip" data-placement="right" title="" data-original-title="<fmt:message key="label.authoring.advanced.discussion.tooltip" />"></i>
+                <i class="fa fa-question-circle" data-toggle="tooltip" data-placement="right" title="" data-original-title="<fmt:message key="label.authoring.advanced.discussion.tooltip" />"></i>
             </div>
 
             <c:if test="${sessionMap.isQuestionEtherpadEnabled}">
@@ -95,11 +120,11 @@
                     <fmt:message key="label.authoring.advanced.shuffle.items" />
                 </label>
             </div>
-            
-            
+
+
         </div>
         <div class="col-sm-6">
-            
+
             <div class="checkbox">
                 <label for="reveal-on-double-click">
                     <form:checkbox path="scratchie.revealOnDoubleClick" id="reveal-on-double-click"/>
@@ -108,7 +133,7 @@
                 <i class="fa fa-question-circle" data-toggle="tooltip" data-placement="right" title=""
                    data-original-title="<fmt:message key="label.authoring.advanced.reveal.double.click.tooltip" />"></i>
             </div>
-            
+
             <div class="checkbox">
                 <label for="require-all-answers">
                     <form:checkbox path="scratchie.requireAllAnswers" id="require-all-answers"/>
@@ -124,152 +149,180 @@
                     <fmt:message key="label.authoring.advanced.show.scratchies.in.results" />
                 </label>
             </div>
-            
-            <div class="form-inline">
-				<label for="relativeTimeLimit">
-					<fmt:message key="label.time.limit" />&nbsp;
-					<i class="fa fa-question-circle" aria-hidden="true" data-toggle="tooltip" data-placement="top" title="" data-original-title="<fmt:message key="label.time.limit.tooltip"/>"></i>
-				</label>
-				<form:input path="scratchie.relativeTimeLimit" type="number" min="0" max="999" size="3" id="relativeTimeLimit" cssClass="form-control input-sm"/>
-			</div>
         </div>
     </div>
-	
+
     <hr>
-    
+
     <a role="button" data-toggle="collapse" href="#dataExchange" aria-expanded="false" aria-controls="dataExchange"><fmt:message key="label.authoring.advanced.data.import"/></a>&nbsp; <i class="fa fa-question-circle" aria-hidden="true" data-toggle="tooltip" data-placement="top" title="" data-original-title="<fmt:message key='label.authoring.advanced.data.import.tooltip'/>"></i>
-    
 
 
-        <div class="collapse  <c:if test="${fn:length(activitiesProvidingConfidenceLevels) > 0}">in</c:if>" id="dataExchange" style="padding: 0px 10px 0px 10px;">
-            
-            <c:if test="${fn:length(activitiesProvidingConfidenceLevels) == 0}">
-                <div class="panel-body" style="font-style: italic"><fmt:message key="label.save.learning.design" /></div>
-            </c:if>
 
+    <div class="collapse  <c:if test="${fn:length(activitiesProvidingConfidenceLevels) > 0}">in</c:if>" id="dataExchange" style="padding: 0px 10px 0px 10px;">
 
-            <c:if test="${fn:length(activitiesProvidingConfidenceLevels) > 0}">
-                <div class="checkbox" style="">
-                    <label for="display-confidence-levels-activities">
-                        <input type="checkbox" id="display-confidence-levels-activities"
-                                <c:if test="${authoringForm.scratchie.confidenceLevelsActivityUiid != null}">checked="true"</c:if>
-                        />
+        <c:if test="${fn:length(activitiesProvidingConfidenceLevels) == 0}">
+            <div class="panel-body" style="font-style: italic"><fmt:message key="label.save.learning.design" /></div>
+        </c:if>
 
-                        <fmt:message key="label.show.confidence.level" />&nbsp;
-                        <form:select path="scratchie.confidenceLevelsActivityUiid" cssClass="form-control input-sm" id="confidence-levels-activity">
-                            <c:forEach var="confidenceProvidingActivity" items="${activitiesProvidingConfidenceLevels}">
-                                <form:option value="${confidenceProvidingActivity.activityUIID}">${confidenceProvidingActivity.title}</form:option>
-                            </c:forEach>
-                        </form:select>
+
+        <c:if test="${fn:length(activitiesProvidingConfidenceLevels) > 0}">
+            <div class="checkbox" style="">
+                <label for="display-confidence-levels-activities">
+                    <input type="checkbox" id="display-confidence-levels-activities"
+                           <c:if test="${authoringForm.scratchie.confidenceLevelsActivityUiid != null}">checked="true"</c:if>
+                    />
+
+                    <fmt:message key="label.show.confidence.level" />&nbsp;
+                    <form:select path="scratchie.confidenceLevelsActivityUiid" cssClass="form-control input-sm" id="confidence-levels-activity">
+                        <c:forEach var="confidenceProvidingActivity" items="${activitiesProvidingConfidenceLevels}">
+                            <form:option value="${confidenceProvidingActivity.activityUIID}">${confidenceProvidingActivity.title}</form:option>
+                        </c:forEach>
+                    </form:select>
+                </label>
+
+                <div class="checkbox loffset20">
+                    <label for="confidence-levels-anonymous">
+                        <form:checkbox path="scratchie.confidenceLevelsAnonymous" id="confidence-levels-anonymous"/>
+                        <fmt:message key="label.anonymous.confidence.level" />
                     </label>
+                </div>
+            </div>
+        </c:if>
 
-                    <div class="checkbox loffset20">
-                        <label for="confidence-levels-anonymous">
-                            <form:checkbox path="scratchie.confidenceLevelsAnonymous" id="confidence-levels-anonymous"/>
-                            <fmt:message key="label.anonymous.confidence.level" />
+        <c:if test="${fn:length(activitiesProvidingVsaAnswers) > 0}">
+
+            <div class="checkbox">
+                <c:choose>
+                    <c:when test="${fn:length(activitiesProvidingVsaAnswers) == 0}">
+                        <fmt:message key="label.no.activities.provide.vsa.answers" />
+                    </c:when>
+
+                    <c:otherwise>
+                        <label for="display-activities-providing-vsa-answers">
+                            <input type="checkbox" id="display-activities-providing-vsa-answers"
+                                   <c:if test="${authoringForm.scratchie.activityUiidProvidingVsaAnswers != null}">checked="true"</c:if>
+                            />
+
+                            <fmt:message key="label.show.vsa.answers" />&nbsp;
+                            <form:select path="scratchie.activityUiidProvidingVsaAnswers" cssClass="form-control input-sm" id="activity-providing-vsa-answers">
+                                <c:forEach var="activityProvidingVsaAnswers" items="${activitiesProvidingVsaAnswers}">
+                                    <form:option value="${activityProvidingVsaAnswers.activityUIID}">${activityProvidingVsaAnswers.title}</form:option>
+                                </c:forEach>
+                            </form:select>
                         </label>
-                    </div>
-                </div>
-            </c:if>
-    
-            <c:if test="${fn:length(activitiesProvidingVsaAnswers) > 0}">
+                    </c:otherwise>
+                </c:choose>
+            </div>
+        </c:if>
+    </div>
 
-                <div class="checkbox">
-                    <c:choose>
-                        <c:when test="${fn:length(activitiesProvidingVsaAnswers) == 0}">
-                            <fmt:message key="label.no.activities.provide.vsa.answers" />
-                        </c:when>
 
-                        <c:otherwise>
-                            <label for="display-activities-providing-vsa-answers">
-                                <input type="checkbox" id="display-activities-providing-vsa-answers"
-                                        <c:if test="${authoringForm.scratchie.activityUiidProvidingVsaAnswers != null}">checked="true"</c:if>
-                                />
+</lams:SimplePanel>
 
-                                <fmt:message key="label.show.vsa.answers" />&nbsp;
-                                <form:select path="scratchie.activityUiidProvidingVsaAnswers" cssClass="form-control input-sm" id="activity-providing-vsa-answers">
-                                    <c:forEach var="activityProvidingVsaAnswers" items="${activitiesProvidingVsaAnswers}">
-                                        <form:option value="${activityProvidingVsaAnswers.activityUIID}">${activityProvidingVsaAnswers.title}</form:option>
-                                    </c:forEach>
-                                </form:select>
-                            </label>
-                        </c:otherwise>
-                    </c:choose>
-                </div>
-            </c:if>
+<lams:SimplePanel titleKey="label.authoring.advance.time.limit">
+
+    <div class="loffset20">
+        <div class="radio form-inline">
+            <label for="timeLimitNone">
+                <input type="radio" name="timeLimit" value="none" id="timeLimitNone"
+                    ${authoringForm.scratchie.relativeTimeLimit eq 0 and authoringForm.scratchie.absoluteTimeLimit eq 0 ? 'checked' : ''}
+                />
+                <fmt:message key="label.authoring.advance.time.limit.none" />
+            </label>
         </div>
 
-    
+        <div class="radio form-inline">
+            <label for="timeLimitRelative">
+                <input type="radio" id="timeLimitRelative" name="timeLimit" value="relative"
+                    ${authoringForm.scratchie.relativeTimeLimit > 0 ? 'checked' : ''} />
+                <fmt:message key="label.authoring.advance.time.limit.relative" />&nbsp;
+            </label>
+            <i class="fa fa-question-circle" data-toggle="tooltip" data-placement="right"
+               title='<fmt:message key="label.authoring.advance.time.limit.relative.tooltip" />'></i>&nbsp;
+            <form:input path="scratchie.relativeTimeLimit" type="number" min="0" max="999" size="3"
+                        id="timeLimitRelativeValue" cssClass="form-control input-sm"/>
+        </div>
+
+        <div class="radio form-inline">
+            <label for="timeLimitAbsolute">
+                <input type="radio" id="timeLimitAbsolute" name="timeLimit" value="absolute"
+                    ${authoringForm.scratchie.absoluteTimeLimit > 0 ? 'checked' : ''} />
+                <fmt:message key="label.authoring.advance.time.limit.absolute" />&nbsp;
+            </label>
+            <i class="fa fa-question-circle" data-toggle="tooltip" data-placement="right"
+               title='<fmt:message key="label.authoring.advance.time.limit.absolute.tooltip" />'></i>&nbsp;
+            <form:input path="scratchie.absoluteTimeLimit" type="number" min="0" max="999" size="3"
+                        id="timeLimitAbsoluteValue" cssClass="form-control input-sm"/>
+        </div>
+    </div>
 </lams:SimplePanel>
 
 
-   
-    
 <c:set var="adTitle"><fmt:message key="label.change.marking.allocation" /></c:set>
 <lams:AdvancedAccordian title="${adTitle}">
-	<div class="panel-body ">
-		<div class="alert alert-warning">
-			<fmt:message key="label.change.marking.allocation.warning" />
-		</div>
-	
-		<div class="checkbox">
-			<label for="overwrite-preset-marks">
-				<input type="checkbox" id="overwrite-preset-marks"
-					<c:if test="${sessionMap.isPresetMarksOverwritten}">checked="true"</c:if>
-				/>
-				<fmt:message key="label.modify.default.marking" />
-			</label>
-		</div>
-		
-		<div class="form-inline">
-			<label for="preset-marks">
-				<fmt:message key="admin.preset.marks" />&nbsp;
-				<form:input id="preset-marks" path="scratchie.presetMarks" size="50" maxlength="255" cssClass="form-control form-control-inline"	/>
-			</label>
-		</div>
-	</div>
+    <div class="panel-body ">
+        <div class="alert alert-warning">
+            <fmt:message key="label.change.marking.allocation.warning" />
+        </div>
+
+        <div class="checkbox">
+            <label for="overwrite-preset-marks">
+                <input type="checkbox" id="overwrite-preset-marks"
+                       <c:if test="${sessionMap.isPresetMarksOverwritten}">checked="true"</c:if>
+                />
+                <fmt:message key="label.modify.default.marking" />
+            </label>
+        </div>
+
+        <div class="form-inline">
+            <label for="preset-marks">
+                <fmt:message key="admin.preset.marks" />&nbsp;
+                <form:input id="preset-marks" path="scratchie.presetMarks" size="50" maxlength="255" cssClass="form-control form-control-inline"	/>
+            </label>
+        </div>
+    </div>
 </lams:AdvancedAccordian>
 
 <lams:OutcomeAuthor toolContentId="${authoringForm.scratchie.contentId}" />
 
 <lams:SimplePanel titleKey="label.activity.completion">
-	<div class="checkbox">
-		<label for="reflect-on">
-			<form:checkbox path="scratchie.reflectOnActivity" id="reflect-on"/>
-			<fmt:message key="label.authoring.advanced.reflectOnActivity" />
-		</label>
-	</div>
-	
-	<div class="form-group">
-		<form:textarea path="scratchie.reflectInstructions"  cssClass="form-control" id="reflectInstructions" rows="3" />
-	</div>
+    <div class="checkbox">
+        <label for="reflect-on">
+            <form:checkbox path="scratchie.reflectOnActivity" id="reflect-on"/>
+            <fmt:message key="label.authoring.advanced.reflectOnActivity" />
+        </label>
+    </div>
+
+    <div class="form-group">
+        <form:textarea path="scratchie.reflectInstructions"  cssClass="form-control" id="reflectInstructions" rows="3" />
+    </div>
 </lams:SimplePanel>
 
 <script type="text/javascript">
-	//automatically turn on refect option if there are text input in refect instruction area
-	var ra = document.getElementById("reflectInstructions");
-	var rao = document.getElementById("reflect-on");
-	function turnOnRefect(){
-		if(isEmpty(ra.value)){
-		//turn off	
-			rao.checked = false;
-		}else{
-		//turn on
-			rao.checked = true;		
-		}
-	}
-	ra.onkeyup=turnOnRefect;
-	
-	//disable #shuffle-items when burning questions option is ON
-	$("#burning-questions-enabled").click(function() {
-		var isBurningQuestionsOn = $("#burning-questions-enabled").is(":checked");
-	
-		$("#shuffle-items").prop("disabled", isBurningQuestionsOn);
-		if (isBurningQuestionsOn) {
-			$("#shuffle-items").prop("checked", false);
-		}
-	});
-	
-	<c:if test="${authoringForm.scratchie.burningQuestionsEnabled}">$("#shuffle-items").prop("disabled", true);</c:if>
-	
-</script>
+    //automatically turn on refect option if there are text input in refect instruction area
+    var ra = document.getElementById("reflectInstructions");
+    var rao = document.getElementById("reflect-on");
+    function turnOnRefect(){
+        if(isEmpty(ra.value)){
+            //turn off
+            rao.checked = false;
+        }else{
+            //turn on
+            rao.checked = true;
+        }
+    }
+    ra.onkeyup=turnOnRefect;
+
+    //disable #shuffle-items when burning questions option is ON
+    $("#burning-questions-enabled").click(function() {
+        var isBurningQuestionsOn = $("#burning-questions-enabled").is(":checked");
+
+        $("#shuffle-items").prop("disabled", isBurningQuestionsOn);
+        if (isBurningQuestionsOn) {
+            $("#shuffle-items").prop("checked", false);
+        }
+    });
+
+    <c:if test="${authoringForm.scratchie.burningQuestionsEnabled}">$("#shuffle-items").prop("disabled", true);</c:if>
+
+</script>
\ No newline at end of file
Index: lams_tool_scratchie/web/pages/monitoring/studentChoices.jsp
===================================================================
diff -u -re7cbf85417c8226f95995e5adb34f7eeb386a98c -reccd6838790a4369b6788e48fb5ae5851622fe35
--- lams_tool_scratchie/web/pages/monitoring/studentChoices.jsp	(.../studentChoices.jsp)	(revision e7cbf85417c8226f95995e5adb34f7eeb386a98c)
+++ lams_tool_scratchie/web/pages/monitoring/studentChoices.jsp	(.../studentChoices.jsp)	(revision eccd6838790a4369b6788e48fb5ae5851622fe35)
@@ -4,7 +4,8 @@
 <c:set var="timeLimitPanelUrl"><lams:LAMSURL/>monitoring/timeLimit.jsp</c:set>
 <c:url var="timeLimitPanelUrl" value="${timeLimitPanelUrl}">
 	<c:param name="toolContentId" value="${scratchie.contentId}"/>
-	<c:param name="absoluteTimeLimit" value="${scratchie.absoluteTimeLimitSeconds}"/>
+	<c:param name="absoluteTimeLimit" value="${scratchie.absoluteTimeLimit}"/>
+	<c:param name="absoluteTimeLimitFinish" value="${scratchie.absoluteTimeLimitFinishSeconds}"/>
 	<c:param name="relativeTimeLimit" value="${scratchie.relativeTimeLimit}"/>
 	<c:param name="isTbl" value="${isTbl}" />
 	<c:param name="controllerContext" value="tool/lascrt11/monitoring" />
Index: lams_tool_scratchie/web/pages/monitoring/studentChoices5.jsp
===================================================================
diff -u -r8a7a259deba12163c46440a712e41bde926fdaf8 -reccd6838790a4369b6788e48fb5ae5851622fe35
--- lams_tool_scratchie/web/pages/monitoring/studentChoices5.jsp	(.../studentChoices5.jsp)	(revision 8a7a259deba12163c46440a712e41bde926fdaf8)
+++ lams_tool_scratchie/web/pages/monitoring/studentChoices5.jsp	(.../studentChoices5.jsp)	(revision eccd6838790a4369b6788e48fb5ae5851622fe35)
@@ -1,15 +1,6 @@
 <%@ include file="/common/taglibs.jsp"%>
 <% pageContext.setAttribute("newLineChar", "\r\n"); %>
 
-<c:set var="timeLimitPanelUrl"><lams:LAMSURL/>monitoring/timeLimit5.jsp</c:set>
-<c:url var="timeLimitPanelUrl" value="${timeLimitPanelUrl}">
-	<c:param name="toolContentId" value="${scratchie.contentId}"/>
-	<c:param name="absoluteTimeLimit" value="${scratchie.absoluteTimeLimitSeconds}"/>
-	<c:param name="relativeTimeLimit" value="${scratchie.relativeTimeLimit}"/>
-	<c:param name="isTbl" value="true" />
-	<c:param name="controllerContext" value="tool/lascrt11/monitoring" />
-</c:url>
-
 <style>
 	/* show horizontal scroller for iPads */
 	body {
@@ -67,9 +58,20 @@
 		openEventSource('<lams:WebAppURL />tblmonitoring/traStudentChoicesFlux.do?toolContentId=${toolContentID}', function(event) {
 			$(tlbMonitorHorizontalScrollElement).load('<lams:WebAppURL />tblmonitoring/traStudentChoicesTable.do?toolContentID=${toolContentID}');
 		});
-		
-		$('#time-limit-panel-placeholder').load('${timeLimitPanelUrl}');
 
+		openEventSource('<lams:WebAppURL />tblmonitoring/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/lascrt11/monitoring');
+		});
+
 		<c:if test="${fn:length(sessionDtos) > 10}">
 			// Add sticky column headers to student choices table.
 			// Standard sticky header CSS solution does not work as it is page which is being scrolled, not the table itself
@@ -197,4 +199,4 @@
 		<div class="col-10 offset-1" id="time-limit-panel-placeholder">
 		</div>
 	</div>
-</div>
+</div>
\ No newline at end of file
Index: lams_tool_whiteboard/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r8a5eb613f404b4bf118cceeca6eb1c5f2c54a471 -reccd6838790a4369b6788e48fb5ae5851622fe35
--- lams_tool_whiteboard/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 8a5eb613f404b4bf118cceeca6eb1c5f2c54a471)
+++ lams_tool_whiteboard/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision eccd6838790a4369b6788e48fb5ae5851622fe35)
@@ -63,7 +63,12 @@
 label.waiting.for.leader = Please, wait while somebody will become a group leader and enter this activity.
 label.users.from.group = Other learners in your group:
 label.refresh = Refresh
-label.time.limit = Time limit (minutes)
+label.authoring.advance.time.limit = Time limit duration (minutes)
+label.authoring.advance.time.limit.none = none
+label.authoring.advance.time.limit.relative = relative to from student start
+label.authoring.advance.time.limit.relative.tooltip = Set the duration in minutes that the learners will 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.authoring.advance.time.limit.absolute = for all learners
+label.authoring.advance.time.limit.absolute.tooltip = Set the number of minutes to finish the assessment for all learners. The duration will apply from the moment the first learner starts the assessment.
 label.plus.one.minute = +1 minute
 label.start.activity = Start activity
 label.started.activity = Activity has been started
@@ -111,7 +116,6 @@
 label.authoring.basic.instructions.tooltip = If you want the students to have a template document to guide them on their collaborative response, add your template here.
 label.authoring.basic.description.tooltip = Description or case to be presented to students.
 label.attendance = Attendance
-label.time.limit.tooltip = Number of minutes that each student will get from the moment they enter this activity. Leave it at 0 for no time restrictions.
 label.monitoring.learner.marks.name = Name
 admin.whiteboard.url = Whiteboard server URL (use [LAMS_SERVER_URL] to mimic LAMS URL without its port)
 admin.access.token = Whiteboard access token
@@ -125,4 +129,4 @@
 label.gallery.walk.state.not.started = not started
 label.gallery.walk.state.started = started
 label.gallery.walk.state.finished = finished
-label.gallery.walk.state.learner.edit.enabled = , learners can modify answers
+label.gallery.walk.state.learner.edit.enabled = , learners can modify answers
\ No newline at end of file
Index: lams_tool_whiteboard/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r5563dc18a8b8d19478fb804c8beef31e63bd249b -reccd6838790a4369b6788e48fb5ae5851622fe35
--- lams_tool_whiteboard/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 5563dc18a8b8d19478fb804c8beef31e63bd249b)
+++ lams_tool_whiteboard/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision eccd6838790a4369b6788e48fb5ae5851622fe35)
@@ -63,7 +63,12 @@
 label.waiting.for.leader = Please, wait while somebody will become a group leader and enter this activity.
 label.users.from.group = Other learners in your group:
 label.refresh = Refresh
-label.time.limit = Time limit (minutes)
+label.authoring.advance.time.limit = Time limit duration (minutes)
+label.authoring.advance.time.limit.none = none
+label.authoring.advance.time.limit.relative = relative to from student start
+label.authoring.advance.time.limit.relative.tooltip = Set the duration in minutes that the learners will 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.authoring.advance.time.limit.absolute = for all learners
+label.authoring.advance.time.limit.absolute.tooltip = Set the number of minutes to finish the assessment for all learners. The duration will apply from the moment the first learner starts the assessment.
 label.plus.one.minute = +1 minute
 label.start.activity = Start activity
 label.started.activity = Activity has been started
@@ -111,7 +116,6 @@
 label.authoring.basic.instructions.tooltip = If you want the students to have a template document to guide them on their collaborative response, add your template here.
 label.authoring.basic.description.tooltip = Description or case to be presented to students.
 label.attendance = Attendance
-label.time.limit.tooltip = Number of minutes that each student will get from the moment they enter this activity. Leave it at 0 for no time restrictions.
 label.monitoring.learner.marks.name = Name
 admin.whiteboard.url = Whiteboard server URL (use [LAMS_SERVER_URL] to mimic LAMS URL without its port)
 admin.access.token = Whiteboard access token
@@ -125,4 +129,4 @@
 label.gallery.walk.state.not.started = not started
 label.gallery.walk.state.started = started
 label.gallery.walk.state.finished = finished
-label.gallery.walk.state.learner.edit.enabled = , learners can modify answers
+label.gallery.walk.state.learner.edit.enabled = , learners can modify answers
\ No newline at end of file
Index: lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/dbupdates/patch20230621.sql
===================================================================
diff -u
--- lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/dbupdates/patch20230621.sql	(revision 0)
+++ lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/dbupdates/patch20230621.sql	(revision eccd6838790a4369b6788e48fb5ae5851622fe35)
@@ -0,0 +1,15 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+SET FOREIGN_KEY_CHECKS=0;
+-- Put all sql statements below here
+
+-- LDEV-5401 Add learner-triggered absolute time limit
+ALTER TABLE tl_lawhiteboard11_whiteboard RENAME COLUMN absolute_time_limit TO absolute_time_limit_finish;
+ALTER TABLE tl_lawhiteboard11_whiteboard ADD COLUMN absolute_time_limit SMALLINT UNSIGNED NOT NULL DEFAULT '0' AFTER relative_time_limit;
+
+-- Put all sql statements above here
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
+SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
Index: lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/model/Whiteboard.java
===================================================================
diff -u -r1621b6daf8385b83e75f7ffde03c017b05c12487 -reccd6838790a4369b6788e48fb5ae5851622fe35
--- lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/model/Whiteboard.java	(.../Whiteboard.java)	(revision 1621b6daf8385b83e75f7ffde03c017b05c12487)
+++ lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/model/Whiteboard.java	(.../Whiteboard.java)	(revision eccd6838790a4369b6788e48fb5ae5851622fe35)
@@ -78,8 +78,11 @@
     private int relativeTimeLimit;
 
     @Column(name = "absolute_time_limit")
-    private LocalDateTime absoluteTimeLimit;
+    private int absoluteTimeLimit;
 
+    @Column(name = "absolute_time_limit_finish")
+    private LocalDateTime absoluteTimeLimitFinish;
+
     @ElementCollection(fetch = FetchType.LAZY)
     @CollectionTable(name = "tl_lawhiteboard11_time_limit", joinColumns = @JoinColumn(name = "whiteboard_uid"))
     @MapKeyColumn(name = "user_id")
@@ -160,7 +163,7 @@
 	    Whiteboard.log.error("When clone " + Whiteboard.class + " failed");
 	}
 
-	whiteboard.setAbsoluteTimeLimit(null);
+	whiteboard.setAbsoluteTimeLimitFinish(null);
 	whiteboard.setTimeLimitAdjustments(new HashMap<>(this.getTimeLimitAdjustments()));
 	whiteboard.setGalleryWalkStarted(false);
 	whiteboard.setGalleryWalkFinished(false);
@@ -194,19 +197,18 @@
     // **********************************************************
     // get/set methods
     // **********************************************************
+
     /**
      * Returns the object's creation date
      *
      * @return date
-     *
      */
     public Date getCreated() {
 	return created;
     }
 
     /**
      * Sets the object's creation date
-     *
      */
     public void setCreated(Date created) {
 	this.created = created;
@@ -251,7 +253,7 @@
 
     /**
      * @param title
-     *            The title to set.
+     * 	The title to set.
      */
     public void setTitle(String title) {
 	this.title = title;
@@ -266,7 +268,7 @@
 
     /**
      * @param lockWhenFinished
-     *            Set to true to lock the whiteboard for finished users.
+     * 	Set to true to lock the whiteboard for finished users.
      */
     public void setLockWhenFinished(boolean lockWhenFinished) {
 	this.lockWhenFinished = lockWhenFinished;
@@ -324,24 +326,34 @@
 
     /**
      * @param timeLimit
-     *            the time limitation, that students have to complete an attempt.
+     * 	the time limitation, that students have to complete an attempt.
      */
     public void setRelativeTimeLimit(int timeLimit) {
 	this.relativeTimeLimit = timeLimit;
     }
 
-    public LocalDateTime getAbsoluteTimeLimit() {
+    public int getAbsoluteTimeLimit() {
 	return absoluteTimeLimit;
     }
 
-    public void setAbsoluteTimeLimit(LocalDateTime absoluteTimeLimit) {
+    public void setAbsoluteTimeLimit(int absoluteTimeLimit) {
 	this.absoluteTimeLimit = absoluteTimeLimit;
     }
 
-    public Long getAbsoluteTimeLimitSeconds() {
-	return absoluteTimeLimit == null ? null : absoluteTimeLimit.atZone(ZoneId.systemDefault()).toEpochSecond();
+    public LocalDateTime getAbsoluteTimeLimitFinish() {
+	return absoluteTimeLimitFinish;
     }
 
+    public void setAbsoluteTimeLimitFinish(LocalDateTime absoluteTimeLimitFinish) {
+	this.absoluteTimeLimitFinish = absoluteTimeLimitFinish;
+    }
+
+    public Long getAbsoluteTimeLimitFinishSeconds() {
+	return absoluteTimeLimitFinish == null
+		? null
+		: absoluteTimeLimitFinish.atZone(ZoneId.systemDefault()).toEpochSecond();
+    }
+
     public Map<Integer, Integer> getTimeLimitAdjustments() {
 	return timeLimitAdjustments;
     }
Index: lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/WhiteboardService.java
===================================================================
diff -u -r5bc88174180046cd153cfc46a0c8ef13675bd4bf -reccd6838790a4369b6788e48fb5ae5851622fe35
--- lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/WhiteboardService.java	(.../WhiteboardService.java)	(revision 5bc88174180046cd153cfc46a0c8ef13675bd4bf)
+++ lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/WhiteboardService.java	(.../WhiteboardService.java)	(revision eccd6838790a4369b6788e48fb5ae5851622fe35)
@@ -30,6 +30,7 @@
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
+import org.lamsfoundation.lams.flux.FluxRegistry;
 import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learningdesign.Grouping;
 import org.lamsfoundation.lams.learningdesign.ToolActivity;
@@ -64,10 +65,7 @@
 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.HttpUrlConnectionUtil;
-import org.lamsfoundation.lams.util.MessageService;
-import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.util.*;
 
 import java.io.*;
 import java.net.HttpURLConnection;
@@ -207,10 +205,29 @@
 
     @Override
     public LocalDateTime launchTimeLimit(long toolContentId, int userId) {
+	int learnersStarted = 0;
+	Whiteboard whiteboard = null;
+	for (WhiteboardSession whiteboardSession : whiteboardSessionDao.getByContentId(toolContentId)) {
+	    if (whiteboard == null) {
+		whiteboard = whiteboardSession.getWhiteboard();
+	    }
+	    learnersStarted += whiteboardUserDao.getBySessionID(whiteboardSession.getSessionId()).size();
+	    if (learnersStarted > 1) {
+		break;
+	    }
+	}
+	if (learnersStarted == 1 && whiteboard.getRelativeTimeLimit() == 0 && whiteboard.getAbsoluteTimeLimit() > 0
+		&& whiteboard.getAbsoluteTimeLimitFinish() == null) {
+	    whiteboard.setAbsoluteTimeLimitFinish(LocalDateTime.now().plusMinutes(whiteboard.getAbsoluteTimeLimit()));
+	    whiteboard.setAbsoluteTimeLimit(0);
+	    whiteboardDao.update(whiteboard);
+
+	    FluxRegistry.emit(CommonConstants.ACTIVITY_TIME_LIMIT_CHANGED_SINK_NAME, Set.of(toolContentId));
+	}
+	
 	WhiteboardUser user = getUserByIDAndContent(Long.valueOf(userId), toolContentId);
 	if (user != null) {
 	    WhiteboardSession session = user.getSession();
-	    Whiteboard whiteboard = session.getWhiteboard();
 
 	    LocalDateTime launchedDate = user.getTimeLimitLaunchedDate();
 	    if (launchedDate == null) {
Index: lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/web/controller/LearningWebsocketServer.java
===================================================================
diff -u -r2bc8f0c2f65f02cb65aa7e90d0bbb612494a4588 -reccd6838790a4369b6788e48fb5ae5851622fe35
--- lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/web/controller/LearningWebsocketServer.java	(.../LearningWebsocketServer.java)	(revision 2bc8f0c2f65f02cb65aa7e90d0bbb612494a4588)
+++ lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/web/controller/LearningWebsocketServer.java	(.../LearningWebsocketServer.java)	(revision eccd6838790a4369b6788e48fb5ae5851622fe35)
@@ -49,8 +49,9 @@
 	Whiteboard whiteboard = whiteboardService.getWhiteboardByContentId(toolContentId);
 	TimeCache existingTimeSettings = new TimeCache();
 
-	existingTimeSettings.absoluteTimeLimitFinish = whiteboard.getAbsoluteTimeLimit();
+	existingTimeSettings.absoluteTimeLimitFinish = whiteboard.getAbsoluteTimeLimitFinish();
 	existingTimeSettings.relativeTimeLimit = whiteboard.getRelativeTimeLimit() * 60;
+	existingTimeSettings.absoluteTimeLimit = whiteboard.getAbsoluteTimeLimit() * 60;
 	existingTimeSettings.timeLimitAdjustment = whiteboard.getTimeLimitAdjustments();
 
 	for (Integer userId : userIds) {
Index: lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/web/controller/MonitoringController.java
===================================================================
diff -u -r1621b6daf8385b83e75f7ffde03c017b05c12487 -reccd6838790a4369b6788e48fb5ae5851622fe35
--- lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision 1621b6daf8385b83e75f7ffde03c017b05c12487)
+++ lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/web/controller/MonitoringController.java	(.../MonitoringController.java)	(revision eccd6838790a4369b6788e48fb5ae5851622fe35)
@@ -46,6 +46,7 @@
 import javax.servlet.http.HttpSession;
 
 import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.flux.FluxRegistry;
 import org.lamsfoundation.lams.gradebook.GradebookUserActivity;
 import org.lamsfoundation.lams.gradebook.service.IGradebookService;
 import org.lamsfoundation.lams.learningdesign.Group;
@@ -64,11 +65,7 @@
 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.Configuration;
-import org.lamsfoundation.lams.util.ConfigurationKeys;
-import org.lamsfoundation.lams.util.DateUtil;
-import org.lamsfoundation.lams.util.MessageService;
-import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.util.*;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.lamsfoundation.lams.web.util.SessionMap;
@@ -306,21 +303,31 @@
     @RequestMapping(path = "/updateTimeLimit", method = RequestMethod.POST)
     @ResponseStatus(HttpStatus.OK)
     public void updateTimeLimit(@RequestParam(name = AttributeNames.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) {
 	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");
 	}
 
 	Whiteboard whiteboard = whiteboardService.getWhiteboardByContentId(toolContentId);
 	whiteboard.setRelativeTimeLimit(relativeTimeLimit);
+	whiteboard.setAbsoluteTimeLimit(absoluteTimeLimit);
 	// set time limit as seconds from start of epoch, using current server time zone
-	whiteboard.setAbsoluteTimeLimit(absoluteTimeLimit == null ? null
-		: LocalDateTime.ofEpochSecond(absoluteTimeLimit, 0, OffsetDateTime.now().getOffset()));
+	whiteboard.setAbsoluteTimeLimitFinish(absoluteTimeLimitFinish == null
+		? null
+		: LocalDateTime.ofEpochSecond(absoluteTimeLimitFinish, 0, OffsetDateTime.now().getOffset()));
+
+	// update monitoring UI where time limits are reflected on dashboard
+	FluxRegistry.emit(CommonConstants.ACTIVITY_TIME_LIMIT_CHANGED_SINK_NAME, Set.of(toolContentId));
 	whiteboardService.saveOrUpdate(whiteboard);
     }
 
Index: lams_tool_whiteboard/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4 -reccd6838790a4369b6788e48fb5ae5851622fe35
--- lams_tool_whiteboard/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4)
+++ lams_tool_whiteboard/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision eccd6838790a4369b6788e48fb5ae5851622fe35)
@@ -13,6 +13,7 @@
 
 	<!-- Initialise Spring MVC. Enforce path suffix use otherwise /start will be recognised but /start.do will not. -->
 	<mvc:annotation-driven>
+		<mvc:async-support default-timeout="10000" task-executor="serverTaskExecutor" />
 		<mvc:path-matching suffix-pattern="true" />
 	</mvc:annotation-driven>
 
Index: lams_tool_whiteboard/web/WEB-INF/web.xml
===================================================================
diff -u -r3f3f34c22194aeaf302e1fd332925dffd35019aa -reccd6838790a4369b6788e48fb5ae5851622fe35
--- lams_tool_whiteboard/web/WEB-INF/web.xml	(.../web.xml)	(revision 3f3f34c22194aeaf302e1fd332925dffd35019aa)
+++ lams_tool_whiteboard/web/WEB-INF/web.xml	(.../web.xml)	(revision eccd6838790a4369b6788e48fb5ae5851622fe35)
@@ -28,6 +28,7 @@
 		<filter-class>
 			org.springframework.orm.hibernate5.support.OpenSessionInViewFilter
 		</filter-class>
+		<async-supported>true</async-supported>
 		<init-param>
 			<param-name>sessionFactoryBeanName</param-name>
 			<param-value>coreSessionFactory</param-value>
@@ -39,12 +40,14 @@
 		<filter-class>
 			org.lamsfoundation.lams.web.session.SystemSessionFilter
 		</filter-class>
+		<async-supported>true</async-supported>
 	</filter>
 	<filter>
 		<filter-name>LocaleFilter</filter-name>
 		<filter-class>
 			org.lamsfoundation.lams.web.filter.LocaleFilter
 		</filter-class>
+		<async-supported>true</async-supported>
 		<init-param>
 			<param-name>encoding</param-name>
 			<param-value>UTF-8</param-value>
@@ -58,18 +61,26 @@
 	<filter-mapping>
 		<filter-name>hibernateFilter</filter-name>
 		<url-pattern>/*</url-pattern>
+		<dispatcher>REQUEST</dispatcher>
+		<dispatcher>ASYNC</dispatcher>
 	</filter-mapping>
 	<filter-mapping>
 		<filter-name>SystemSessionFilter</filter-name>
 		<url-pattern>/*</url-pattern>
+		<dispatcher>REQUEST</dispatcher>
+		<dispatcher>ASYNC</dispatcher>
 	</filter-mapping>
 	<filter-mapping>
 		<filter-name>LocaleFilter</filter-name>
 		<url-pattern>/*</url-pattern>
+		<dispatcher>REQUEST</dispatcher>
+		<dispatcher>ASYNC</dispatcher>
 	</filter-mapping>
 	<filter-mapping>
 		<filter-name>CSRFGuard</filter-name> 
 		<url-pattern>*.do</url-pattern>
+		<dispatcher>REQUEST</dispatcher>
+		<dispatcher>ASYNC</dispatcher>
 	</filter-mapping>
 
 	<servlet>
@@ -78,6 +89,7 @@
 			org.springframework.web.servlet.DispatcherServlet
 		</servlet-class>
 		<load-on-startup>1</load-on-startup>
+		<async-supported>true</async-supported>
 	</servlet>
 
 	<servlet>
@@ -92,6 +104,7 @@
 			<param-value>false</param-value>
 		</init-param>
 		<load-on-startup>1</load-on-startup>
+		<async-supported>true</async-supported>
 	</servlet>
 
 	<!-- The download servlet, reused from the content repository jar -->
@@ -105,6 +118,7 @@
 			<param-value>whiteboardToolContentHandler</param-value>
 		</init-param>
 		<load-on-startup>3</load-on-startup>
+		<async-supported>true</async-supported>
 	</servlet>
 
 	<servlet-mapping>
@@ -260,4 +274,4 @@
 		<error-code>404</error-code>
 		<location>/404.jsp</location>
 	</error-page>
-</web-app>
+</web-app>
\ No newline at end of file
Index: lams_tool_whiteboard/web/pages/authoring/advance.jsp
===================================================================
diff -u -r90e5fd15f6474eb56d0b497d1b73e14bda75e262 -reccd6838790a4369b6788e48fb5ae5851622fe35
--- lams_tool_whiteboard/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 90e5fd15f6474eb56d0b497d1b73e14bda75e262)
+++ lams_tool_whiteboard/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision eccd6838790a4369b6788e48fb5ae5851622fe35)
@@ -2,20 +2,45 @@
 
 <!-- Advance Tab Content -->
 
-<script>			
+<script>
 	// avoid name clash between bootstrap and jQuery UI
 	$.fn.bootstrapTooltip = $.fn.tooltip.noConflict();
-	
+
 	$(document).ready(function() {
 		$('#gallery-walk-enabled').change(function(){
 			if ($(this).is(':checked')) {
 				$('#gallery-walk-options').slideDown();
 			} else {
 				$('#gallery-walk-options').slideUp()
-					.find('#gallery-walk-read-only').prop('checked', false);
+						.find('#gallery-walk-read-only').prop('checked', false);
 			}
 		}).change();
-		
+
+		// time limit various options functionality
+		$('input[name="timeLimit"]').change(function(){
+			let timeLimitTypeNone = $('#timeLimitNone'),
+					timeLimitTypeRelative = $('#timeLimitRelative'),
+					timeLimitTypeRelativeValue = $('#timeLimitRelativeValue'),
+					timeLimitTypeAbsolute = $('#timeLimitAbsolute'),
+					timeLimitTypeAbsoluteValue = $('#timeLimitAbsoluteValue');
+
+			if (timeLimitTypeNone.prop('checked')) {
+				timeLimitTypeRelativeValue.prop('disabled', true).val(0);
+				timeLimitTypeAbsoluteValue.prop('disabled', true).val(0);
+				return;
+			}
+			if (timeLimitTypeRelative.prop('checked')) {
+				timeLimitTypeRelativeValue.prop('disabled', false);
+				timeLimitTypeAbsoluteValue.prop('disabled', true).val(0);
+				return;
+			}
+			if (timeLimitTypeAbsolute.prop('checked')) {
+				timeLimitTypeRelativeValue.prop('disabled', true).val(0);
+				timeLimitTypeAbsoluteValue.prop('disabled', false);
+				return;
+			}
+		}).first().change();
+
 		$('[data-toggle="tooltip"]').bootstrapTooltip();
 	});
 </script>
@@ -31,13 +56,44 @@
 
 <lams:SimplePanel titleKey="label.resource.options">
 
-	<div class="form-inline">
-		<label for="relativeTimeLimit">
-			<fmt:message key="label.time.limit" />&nbsp;
-            <i class="fa fa-question-circle" aria-hidden="true" data-toggle="tooltip" data-placement="top" title="" data-original-title="<fmt:message key="label.time.limit.tooltip"/>"></i>
-		</label>
-        <form:input path="whiteboard.relativeTimeLimit" type="number" min="0" size="2" id="relativeTimeLimit" cssClass="form-control input-sm"/>        
-    </div>
+	<fmt:message key="label.authoring.advance.time.limit" />
+
+	<div class="loffset20">
+		<div class="radio form-inline">
+			<label for="timeLimitNone">
+				<input type="radio" name="timeLimit" value="none" id="timeLimitNone"
+					${authoringForm.whiteboard.relativeTimeLimit eq 0 and authoringForm.whiteboard.absoluteTimeLimit eq 0 ? 'checked' : ''}
+				/>
+				<fmt:message key="label.authoring.advance.time.limit.none" />
+			</label>
+		</div>
+
+		<div class="radio form-inline">
+			<label for="timeLimitRelative">
+				<input type="radio" id="timeLimitRelative" name="timeLimit" value="relative"
+					${authoringForm.whiteboard.relativeTimeLimit > 0 ? 'checked' : ''} />
+				<fmt:message key="label.authoring.advance.time.limit.relative" />&nbsp;
+			</label>
+			<i class="fa fa-question-circle" data-toggle="tooltip" data-placement="right"
+			   title='<fmt:message key="label.authoring.advance.time.limit.relative.tooltip" />'></i>&nbsp;
+			<form:input path="whiteboard.relativeTimeLimit" type="number" min="0" max="999" size="3"
+						id="timeLimitRelativeValue" cssClass="form-control input-sm"/>
+
+		</div>
+
+		<div class="radio form-inline">
+			<label for="timeLimitAbsolute">
+				<input type="radio" id="timeLimitAbsolute" name="timeLimit" value="absolute"
+					${authoringForm.whiteboard.absoluteTimeLimit > 0 ? 'checked' : ''} />
+				<fmt:message key="label.authoring.advance.time.limit.absolute" />&nbsp;
+			</label>
+			<i class="fa fa-question-circle" data-toggle="tooltip" data-placement="right"
+			   title='<fmt:message key="label.authoring.advance.time.limit.absolute.tooltip" />'></i>&nbsp;
+			<form:input path="whiteboard.absoluteTimeLimit" type="number" min="0" max="999" size="3"
+						id="timeLimitAbsoluteValue" cssClass="form-control input-sm"/>
+
+		</div>
+	</div>
 </lams:SimplePanel>
 
 <lams:SimplePanel titleKey="label.gallery.walk">
@@ -47,30 +103,30 @@
 	<p>
 		<fmt:message key="label.authoring.advance.gallery.walk.info2" />
 	</p>
-	
+
 	<div class="checkbox">
 		<label for="gallery-walk-enabled">
 			<form:checkbox path="whiteboard.galleryWalkEnabled" id="gallery-walk-enabled" />
 			<fmt:message key="label.authoring.advance.gallery.walk.enabled" />
 		</label>
 	</div>
-	
+
 	<div id="gallery-walk-options" class="loffset10">
 		<div class="checkbox">
 			<label for="gallery-walk-read-only">
 				<form:checkbox path="whiteboard.galleryWalkReadOnly" id="gallery-walk-read-only" />
 				<fmt:message key="label.authoring.advance.gallery.walk.read.only" />
 			</label>
-			<i class="fa fa-question-circle" 
+			<i class="fa fa-question-circle"
 			   data-toggle="tooltip" title="<fmt:message key='label.authoring.advance.gallery.walk.read.only.tooltip' />"></i>
 		</div>
-		
+
 		<div class="form-group">
 			<fmt:message key='label.authoring.advance.gallery.walk.instructions' var="galleryWalkInstructions"/>
-			<form:textarea path="whiteboard.galleryWalkInstructions" cssClass="form-control" rows="3" 
+			<form:textarea path="whiteboard.galleryWalkInstructions" cssClass="form-control" rows="3"
 						   placeholder="${galleryWalkInstructions}" />
 		</div>
-		
+
 	</div>
 </lams:SimplePanel>
 
@@ -84,18 +140,18 @@
 			<fmt:message key="label.authoring.advance.lock.on.finished" />
 		</label>
 	</div>
-	
+
 	<div class="checkbox">
 		<label for="reflect-on">
 			<form:checkbox path="whiteboard.reflectOnActivity" id="reflect-on"/>
 			<fmt:message key="label.authoring.advanced.reflectOnActivity" />
 		</label>
 	</div>
-	
+
 	<div class="form-group">
 		<form:textarea path="whiteboard.reflectInstructions" cssClass="form-control" id="reflect-instructions" rows="3" />
 	</div>
-	
+
 </lams:SimplePanel>
 
 <script type="text/javascript">
Index: lams_tool_whiteboard/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r47dddf6db4afaba99d8f3f88fc50b16df9251a76 -reccd6838790a4369b6788e48fb5ae5851622fe35
--- lams_tool_whiteboard/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 47dddf6db4afaba99d8f3f88fc50b16df9251a76)
+++ lams_tool_whiteboard/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision eccd6838790a4369b6788e48fb5ae5851622fe35)
@@ -6,11 +6,12 @@
 
 <c:set var="timeLimitPanelUrl"><lams:LAMSURL/>monitoring/timeLimit.jsp</c:set>
 <c:url var="timeLimitPanelUrl" value="${timeLimitPanelUrl}">
-		<c:param name="toolContentId" value="${whiteboard.contentId}"/>
-		<c:param name="absoluteTimeLimit" value="${whiteboard.absoluteTimeLimitSeconds}"/>
-		<c:param name="relativeTimeLimit" value="${whiteboard.relativeTimeLimit}"/>
-		<c:param name="isTbl" value="${isTbl}" />
-		<c:param name="controllerContext" value="tool/lawhiteboard11/monitoring" />
+	<c:param name="toolContentId" value="${whiteboard.contentId}"/>
+	<c:param name="absoluteTimeLimitFinish" value="${whiteboard.absoluteTimeLimitFinishSeconds}"/>
+	<c:param name="absoluteTimeLimit" value="${whiteboard.absoluteTimeLimit}"/>
+	<c:param name="relativeTimeLimit" value="${whiteboard.relativeTimeLimit}"/>
+	<c:param name="isTbl" value="${isTbl}" />
+	<c:param name="controllerContext" value="tool/lawhiteboard11/monitoring" />
 </c:url>
 
 <%@ page import="org.lamsfoundation.lams.tool.whiteboard.WhiteboardConstants"%>
@@ -20,97 +21,97 @@
 <link rel="stylesheet" href="${lams}css/jquery.tablesorter.theme.bootstrap.css"/>
 <link rel="stylesheet" href="${lams}css/jquery.tablesorter.pager.css" />
 <link href="${lams}css/jquery-ui.timepicker.css" rel="stylesheet" type="text/css">
-	
+
 <style media="screen,projection" type="text/css">
-	 		
+
 	.whiteboard-monitoring-summary .countdown-timeout {
 		color: #FF3333 !important;
 	}
-	
+
 	.whiteboard-monitoring-summary #time-limit-table th {
 		vertical-align: middle;
 	}
-	
+
 	.whiteboard-monitoring-summary #time-limit-table td.centered {
 		text-align: center;
 	}
 
 	.whiteboard-monitoring-summary .panel {
 		overflow: auto;
 	}
-	
+
 	.whiteboard-monitoring-summary #control-buttons {
 		float: right;
 		margin-bottom: 20px;
 	}
-	
+
 	.whiteboard-monitoring-summary #gallery-walk-panel {
 		width: 30%;
 		margin: auto;
 		margin-bottom: 20px;
 		text-align: center;
 	}
-	
+
 	.whiteboard-monitoring-summary #gallery-walk-panel.gallery-walk-panel-ratings {
 		width: 100%;
 	}
-	
+
 	.whiteboard-monitoring-summary #gallery-walk-learner-edit {
 		margin-top: 20px;
 		margin-bottom: 20px;
 	}
-	
+
 	.whiteboard-monitoring-summary #gallery-walk-rating-table th {
 		font-weight: bold;
 		font-style: normal;
 		text-align: center;
 	}
-	
+
 	.whiteboard-monitoring-summary #gallery-walk-rating-table td {
 		text-align: center;
 	}
-	
+
 	.whiteboard-monitoring-summary #gallery-walk-rating-table th:first-child, .whiteboard-monitoring-summary #gallery-walk-rating-table td:first-child {
 		text-align: right;
 	}
-	
+
 	.whiteboard-monitoring-summary .tablesorter tbody > tr > td > div[contenteditable=true]:focus {
-	  outline: #337ab7 2px solid;
+		outline: #337ab7 2px solid;
 	}
-	
+
 	.whiteboard-monitoring-summary #no-session-summary, .whiteboard-monitoring-summary .attendance-row {
 		margin-right: 0;
 	}
-	
+
 	/* We need to overwrite settings coming from main CSS as in Whiteboard monitoring they look different */
-	
+
 	.whiteboard-monitoring-summary .ts-pager {
-	    color: black;
+		color: black;
 	}
-	
+
 	.whiteboard-monitoring-summary .ts-pager .btn {
-	    background-color: #eee;
+		background-color: #eee;
 	}
 	.whiteboard-monitoring-summary .tablesorter tfoot th {
 		background-color: #eee !important;
 	}
-	
+
 	.whiteboard-monitoring-summary .pagesize {
-	    border: black;
-	    background: white;
+		border: black;
+		background: white;
 	}
-					
+
 	.whiteboard-monitoring-summary .whiteboard-frame {
 		width: 100%;
 		height: 700px;
 		border: 1px solid #c1c1c1;
 	}
-	
+
 	.full-screen-launch-button {
 		margin-bottom: 5px;
 		margin-top: 5px;
 	}
-	
+
 	.full-screen-exit-button {
 		display: none;
 		margin-bottom: 5px;
@@ -119,11 +120,11 @@
 	.full-screen-content-div:fullscreen {
 		padding: 20px 0 70px 0;
 	}
-	
+
 	.full-screen-content-div:fullscreen .full-screen-flex-div {
 		margin: 0 2%;
 	}
-	
+
 	.full-screen-content-div:fullscreen .full-screen-flex-div,
 	.full-screen-content-div:fullscreen .full-screen-main-div,
 	.full-screen-content-div:fullscreen .whiteboard-frame {
@@ -134,7 +135,7 @@
 
 <script>
 	// pass settings to monitorToolSummaryAdvanced.js
-    let submissionDeadlineSettings = {
+	let submissionDeadlineSettings = {
 		lams: '<lams:LAMSURL />',
 		submissionDeadline: '${submissionDeadline}',
 		submissionDateString: '${submissionDateString}',
@@ -148,27 +149,27 @@
 <script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery.plugin.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery-ui.timepicker.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script> 
-<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter.js"></script> 
-<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-widgets.js"></script>  
-<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-pager.js"></script> 
+<script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-widgets.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-pager.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-editable.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/jquery.countdown.js"></script> 
+<script type="text/javascript" src="${lams}includes/javascript/jquery.countdown.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/portrait.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/fullscreen.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/monitorToolSummaryAdvanced.js" ></script>
 <script type="text/javascript">
 	//var for jquery.jRating.js
 	var pathToImageFolder = "${lams}images/css/",
-		//vars for rating.js
-		AVG_RATING_LABEL = '<fmt:message key="label.average.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param></fmt:message>',
-		YOUR_RATING_LABEL = '<fmt:message key="label.your.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param><fmt:param>@3@</fmt:param></fmt:message>',
-		MAX_RATES = 0,
-		MIN_RATES = 0,
-		LAMS_URL = '${lams}',
-		COUNT_RATED_ITEMS = true,
-		ALLOW_RERATE = false;
-	
+			//vars for rating.js
+			AVG_RATING_LABEL = '<fmt:message key="label.average.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param></fmt:message>',
+			YOUR_RATING_LABEL = '<fmt:message key="label.your.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param><fmt:param>@3@</fmt:param></fmt:message>',
+			MAX_RATES = 0,
+			MIN_RATES = 0,
+			LAMS_URL = '${lams}',
+			COUNT_RATED_ITEMS = true,
+			ALLOW_RERATE = false;
+
 	$(document).ready(function(){
 		// show Whiteboards only on Group expand
 		$('#whiteboard-monitoring-summary-${sessionMap.toolContentID} .whiteboard-collapse').on('show.bs.collapse', function(){
@@ -178,143 +179,143 @@
 				whiteboard.data('src', null);
 			}
 		});
-		
+
 		$("#whiteboard-monitoring-summary-${sessionMap.toolContentID} .fix-faulty-pad").click(function() {
 			var toolSessionId = $(this).data("session-id");
 			var button = $(this);
-			
-	    	//block #buttons
-	    	$(this).block({
-	    		message: '<h4 style="color:#fff";><fmt:message key="label.pad.started.fixing" /></h4>',
-	    		baseZ: 1000000,
-	    		fadeIn: 0,
-	    		css: {
-	    			border: 'none',
-	    		    padding: "2px 7px", 
-	    		    backgroundColor: '#000', 
-	    		    '-webkit-border-radius': '10px', 
-	    		    '-moz-border-radius': '10px', 
-	    		    opacity: .98 ,
-	    		    left: "0px",
-	    		    width: "360px"
-	    		},
-	    		overlayCSS: {
-	    			opacity: 0
-	    		}
-	    	});
-	    	
-	        $.ajax({
-	        	async: true,
-	            url: '<c:url value="/monitoring/fixFaultySession.do"/>',
-	            data : 'toolSessionID=' + toolSessionId,
-	            type: 'post',
-	            success: function (response) {
-	            	button.parent().html('<fmt:message key="label.pad.fixed" />');
-	            	alert('<fmt:message key="label.pad.fixed" />');
-	            },
-	            error: function (request, status, error) {
-	            	button.unblock();
-	                alert(request.responseText);
-	            }
-	       	});
+
+			//block #buttons
+			$(this).block({
+				message: '<h4 style="color:#fff";><fmt:message key="label.pad.started.fixing" /></h4>',
+				baseZ: 1000000,
+				fadeIn: 0,
+				css: {
+					border: 'none',
+					padding: "2px 7px",
+					backgroundColor: '#000',
+					'-webkit-border-radius': '10px',
+					'-moz-border-radius': '10px',
+					opacity: .98 ,
+					left: "0px",
+					width: "360px"
+				},
+				overlayCSS: {
+					opacity: 0
+				}
+			});
+
+			$.ajax({
+				async: true,
+				url: '<c:url value="/monitoring/fixFaultySession.do"/>',
+				data : 'toolSessionID=' + toolSessionId,
+				type: 'post',
+				success: function (response) {
+					button.parent().html('<fmt:message key="label.pad.fixed" />');
+					alert('<fmt:message key="label.pad.fixed" />');
+				},
+				error: function (request, status, error) {
+					button.unblock();
+					alert(request.responseText);
+				}
+			});
 		});
-		
+
 		// marks table for each group
 		var tablesorters = $("#whiteboard-monitoring-summary-${sessionMap.toolContentID} .tablesorter");
 		// intialise tablesorter tables
 		tablesorters.tablesorter({
 			theme: 'bootstrap',
 			headerTemplate : '{content} {icon}',
-		    sortInitialOrder: 'asc',
-		    sortList: [[0]],
-		    widgets: [ "uitheme", "resizable", "editable" ],
-		    headers: { 0: { sorter: true}, 1: { sorter: true}  }, 
-		    sortList : [[0,1]],
-		    showProcessing: false,
-		    widgetOptions: {
-		    	resizable: true,
-		    	
-		    	// only marks is editable
-		        editable_columns       : [1],
-		        editable_enterToAccept : true,          // press enter to accept content, or click outside if false
-		        editable_autoAccept    : false,          // accepts any changes made to the table cell automatically
-		        editable_autoResort    : false,         // auto resort after the content has changed.
-		        editable_validate      : function (text, original, columnIndex) {
-		        	// removing all text produces "&nbsp;", so get rid of it
-		        	text = text ? text.replace(/&nbsp;/g, '').trim() : null;
-		        	// acceptable values are empty text or a number
-		        	return !text || !isNaN(text) ? text : original;
-		        },
-		        editable_selectAll     : function(txt, columnIndex, $element) {
-		          // note $element is the div inside of the table cell, so use $element.closest('td') to get the cell
-		          // only select everthing within the element when the content starts with the letter "B"
-		          return true;
-		        },
-		        editable_wrapContent   : '<div>',       // wrap all editable cell content... makes this widget work in IE, and with autocomplete
-		        editable_trimContent   : true,          // trim content ( removes outer tabs & carriage returns )
-		        editable_editComplete  : 'editComplete' // event fired after the table content has been edited
-		    }
+			sortInitialOrder: 'asc',
+			sortList: [[0]],
+			widgets: [ "uitheme", "resizable", "editable" ],
+			headers: { 0: { sorter: true}, 1: { sorter: true}  },
+			sortList : [[0,1]],
+			showProcessing: false,
+			widgetOptions: {
+				resizable: true,
+
+				// only marks is editable
+				editable_columns       : [1],
+				editable_enterToAccept : true,          // press enter to accept content, or click outside if false
+				editable_autoAccept    : false,          // accepts any changes made to the table cell automatically
+				editable_autoResort    : false,         // auto resort after the content has changed.
+				editable_validate      : function (text, original, columnIndex) {
+					// removing all text produces "&nbsp;", so get rid of it
+					text = text ? text.replace(/&nbsp;/g, '').trim() : null;
+					// acceptable values are empty text or a number
+					return !text || !isNaN(text) ? text : original;
+				},
+				editable_selectAll     : function(txt, columnIndex, $element) {
+					// note $element is the div inside of the table cell, so use $element.closest('td') to get the cell
+					// only select everthing within the element when the content starts with the letter "B"
+					return true;
+				},
+				editable_wrapContent   : '<div>',       // wrap all editable cell content... makes this widget work in IE, and with autocomplete
+				editable_trimContent   : true,          // trim content ( removes outer tabs & carriage returns )
+				editable_editComplete  : 'editComplete' // event fired after the table content has been edited
+			}
 		});
-		
+
 		// update mark on edit
 		tablesorters.each(function(){
-		    // config event variable new in v2.17.6
-		    $(this).children('tbody').on('editComplete', 'td', function(event, config) {
-		      var $this = $(this),
-		        mark = $this.text() ? +$this.text() : null,
-		        toolSessionId = +$this.closest('.tablesorter').attr('toolSessionId'),
-		        userId = +$this.closest('tr').attr('userId'); 
-		        
-		        // max mark is 100
-		        if (mark > 100) {
-		        	mark = 100;
-		        	$this.text(mark);
-		        }
+			// config event variable new in v2.17.6
+			$(this).children('tbody').on('editComplete', 'td', function(event, config) {
+				var $this = $(this),
+						mark = $this.text() ? +$this.text() : null,
+						toolSessionId = +$this.closest('.tablesorter').attr('toolSessionId'),
+						userId = +$this.closest('tr').attr('userId');
 
-		        $.ajax({
-		        	async: true,
-		            url: '<c:url value="/monitoring/updateLearnerMark.do"/>',
-		            data : {
-		            	'toolSessionId' : toolSessionId,
-		            	'userId'		: userId,
-		            	'mark'			: mark,
-		            	'<csrf:tokenname/>' : '<csrf:tokenvalue/>'
-		            },
-		            type: 'post',
-		            error: function (request, status, error) {
-		                alert('<fmt:message key="messsage.monitoring.learner.marks.update.fail" />');
-		            }
-		       	});
-		        
-		    });
+				// max mark is 100
+				if (mark > 100) {
+					mark = 100;
+					$this.text(mark);
+				}
+
+				$.ajax({
+					async: true,
+					url: '<c:url value="/monitoring/updateLearnerMark.do"/>',
+					data : {
+						'toolSessionId' : toolSessionId,
+						'userId'		: userId,
+						'mark'			: mark,
+						'<csrf:tokenname/>' : '<csrf:tokenvalue/>'
+					},
+					type: 'post',
+					error: function (request, status, error) {
+						alert('<fmt:message key="messsage.monitoring.learner.marks.update.fail" />');
+					}
+				});
+
+			});
 		});
 
 		// pager processing
 		tablesorters.each(function() {
 			var toolSessionId = $(this).attr('toolSessionId');
-			
+
 			$(this).tablesorterPager({
 				processAjaxOnInit: true,
 				initialRows: {
-			        total: 10
-			      },
-			    savePages: false, 
-			    container: $(this).find(".ts-pager"),
-		        output: '{startRow} to {endRow} ({totalRows})',
-		        cssPageDisplay: '.pagedisplay',
-		        cssPageSize: '.pagesize',
-		        cssDisabled: 'disabled',
+					total: 10
+				},
+				savePages: false,
+				container: $(this).find(".ts-pager"),
+				output: '{startRow} to {endRow} ({totalRows})',
+				cssPageDisplay: '.pagedisplay',
+				cssPageSize: '.pagesize',
+				cssDisabled: 'disabled',
 				ajaxUrl : "<c:url value='/monitoring/getLearnerMarks.do?{sortList:column}&page={page}&size={size}&toolSessionId='/>" + toolSessionId,
 				ajaxProcessing: function (data, table) {
-			    	if (data && data.hasOwnProperty('rows')) {
-			    		var rows = [],
-			            json = {};
+					if (data && data.hasOwnProperty('rows')) {
+						var rows = [],
+								json = {};
 
-			    		
-			    		for (i = 0; i < data.rows.length; i++){
+
+						for (i = 0; i < data.rows.length; i++){
 							var userData = data.rows[i],
-								isLeader = userData['isLeader'];
-							
+									isLeader = userData['isLeader'];
+
 							rows += '<tr userId="' + userData['userId'] + '" ' + (isLeader ? 'class="info"' : '') + '>';
 
 							rows += '<td style="width: 80%">';
@@ -323,93 +324,80 @@
 								rows += '&nbsp;<i title="<fmt:message key="label.monitoring.team.leader"/>" class="text-primary fa fa-star"></i>';
 							}
 							rows += '</td>';
-														
+
 							rows += '<td>';
 							rows += 	userData['mark'];
 							rows += '</td>';
 
 							rows += '</tr>';
 						}
-			            
+
 						json.total = data.total_rows;
 						json.rows = $(rows);
 						return json;
-			    	}
+					}
 				}
-		  	})
-		   .bind('pagerInitialized pagerComplete', function(event, options){
-			  if ( options.totalRows == 0 ) {
-				  $.tablesorter.showError($(this), '<fmt:message key="messsage.monitoring.learner.marks.no.data"/>');
-			  }
-			});
+			})
+					.bind('pagerInitialized pagerComplete', function(event, options){
+						if ( options.totalRows == 0 ) {
+							$.tablesorter.showError($(this), '<fmt:message key="messsage.monitoring.learner.marks.no.data"/>');
+						}
+					});
 		});
 
-		
-		// create counter if absolute time limit is set
-		if (absoluteTimeLimit) {
-			updateAbsoluteTimeLimitCounter();
-			
-			// expand time limit panel if absolute time limit is set and not expired
-			if (absoluteTimeLimit > new Date().getTime() / 1000) {
-				$('#time-limit-collapse').collapse('show');
-			}
-		}
-		initInidividualTimeLimitAutocomplete();
-		
-		
 		<c:if test="${isTbl}">
-			//insert total learners number taken from the parent tblmonitor.jsp
-			$("#whiteboard-monitoring-summary-${sessionMap.toolContentID} .total-learners-number").text(TOTAL_LESSON_LEARNERS_NUMBER);
+		//insert total learners number taken from the parent tblmonitor.jsp
+		$("#whiteboard-monitoring-summary-${sessionMap.toolContentID} .total-learners-number").text(TOTAL_LESSON_LEARNERS_NUMBER);
 		</c:if>
 
 		setupFullScreenEvents();
 
 		$('#time-limit-panel-placeholder').load('${timeLimitPanelUrl}');
 	});
-	
+
 	function startGalleryWalk(){
 		if (!confirm('<fmt:message key="monitoring.summary.gallery.walk.start.confirm" />')) {
 			return;
 		}
-		
+
 		$.ajax({
 			'url' : '<c:url value="/monitoring/startGalleryWalk.do"/>',
 			'data': {
 				toolContentID : ${whiteboard.contentId}
 			},
 			'success' : function(){
 				<c:choose>
-					<c:when test="${isTbl}">
-						// reload current tab with Whiteboard summary
-						loadTab(null, null, false);
-					</c:when>
-					<c:otherwise>
-						location.reload();
-					</c:otherwise>
+				<c:when test="${isTbl}">
+				// reload current tab with Whiteboard summary
+				loadTab(null, null, false);
+				</c:when>
+				<c:otherwise>
+				location.reload();
+				</c:otherwise>
 				</c:choose>
 			}
 		});
 	}
-	
+
 	function finishGalleryWalk(){
 		if (!confirm('<fmt:message key="monitoring.summary.gallery.walk.finish.confirm" />')) {
 			return;
 		}
-		
+
 		$.ajax({
 			'url' : '<c:url value="/monitoring/finishGalleryWalk.do"/>',
 			'data': {
 				toolContentID : ${whiteboard.contentId}
 			},
 			'success' : function(){
 				<c:choose>
-					<c:when test="${isTbl}">
-						// reload current tab with Whiteboard summary
-						loadTab(null, null, false);
-					</c:when>
-					<c:otherwise>
-						location.reload();
-					</c:otherwise>
+				<c:when test="${isTbl}">
+				// reload current tab with Whiteboard summary
+				loadTab(null, null, false);
+				</c:when>
+				<c:otherwise>
+				location.reload();
+				</c:otherwise>
 				</c:choose>
 			}
 		});
@@ -419,52 +407,52 @@
 		if (!confirm('<fmt:message key="monitoring.summary.gallery.walk.learner.edit.confirm" />')) {
 			return;
 		}
-		
+
 		$.ajax({
 			'url' : '<c:url value="/monitoring/enableGalleryWalkLearnerEdit.do"/>',
 			'data': {
 				toolContentID : ${whiteboard.contentId}
 			},
 			'success' : function(){
 				<c:choose>
-					<c:when test="${isTbl}">
-						// reload current tab with Doku summary
-						loadTab(null, null, false);
-					</c:when>
-					<c:otherwise>
-						location.reload();
-					</c:otherwise>
+				<c:when test="${isTbl}">
+				// reload current tab with Doku summary
+				loadTab(null, null, false);
+				</c:when>
+				<c:otherwise>
+				location.reload();
+				</c:otherwise>
 				</c:choose>
 			}
 		});
 	}
-	
+
 	function showChangeLeaderModal(toolSessionId) {
 		$('#whiteboard-monitoring-summary-${sessionMap.toolContentID} #change-leader-modals').empty()
-		.load('<c:url value="/monitoring/displayChangeLeaderForGroupDialogFromActivity.do" />',{
-			toolSessionID : toolSessionId
-		});
+				.load('<c:url value="/monitoring/displayChangeLeaderForGroupDialogFromActivity.do" />',{
+					toolSessionID : toolSessionId
+				});
 	}
 
 	function onChangeLeaderCallback(response, leaderUserId, toolSessionId){
-        if (response.isSuccessful) {
-            $.ajax({
-    			'url' : '<c:url value="/monitoring/changeLeaderForGroup.do"/>',
-    			'type': 'post',
-    			'cache' : 'false',
-    			'data': {
-    				'toolSessionID' : toolSessionId,
-    				'leaderUserId' : leaderUserId,
-    				'<csrf:tokenname/>' : '<csrf:tokenvalue/>'
-    			},
-    			success : function(){
-    				alert("<fmt:message key='label.monitoring.leader.successfully.changed'/>");
-    			},
-    			error : function(){
-    				alert("<fmt:message key='label.monitoring.leader.not.changed'/>");
-        		}
-            });
-        	
+		if (response.isSuccessful) {
+			$.ajax({
+				'url' : '<c:url value="/monitoring/changeLeaderForGroup.do"/>',
+				'type': 'post',
+				'cache' : 'false',
+				'data': {
+					'toolSessionID' : toolSessionId,
+					'leaderUserId' : leaderUserId,
+					'<csrf:tokenname/>' : '<csrf:tokenvalue/>'
+				},
+				success : function(){
+					alert("<fmt:message key='label.monitoring.leader.successfully.changed'/>");
+				},
+				error : function(){
+					alert("<fmt:message key='label.monitoring.leader.not.changed'/>");
+				}
+			});
+
 		} else {
 			alert("<fmt:message key='label.monitoring.leader.not.changed'/>");
 		}
@@ -484,198 +472,198 @@
 						<div class="panel panel-default">
 							<div class="panel-heading">
 								<h4 class="panel-title">
-									<i class="fa fa-users" style="color:gray" ></i> 
-									<fmt:message key="label.attendance"/>: <span>${attemptedLearnersNumber}</span>/<span class="total-learners-number"></span> 
-								</h4> 
+									<i class="fa fa-users" style="color:gray" ></i>
+									<fmt:message key="label.attendance"/>: <span>${attemptedLearnersNumber}</span>/<span class="total-learners-number"></span>
+								</h4>
 							</div>
 						</div>
 					</div>
 				</div>
 			</c:when>
 			<c:otherwise>
 				<h4>
-				    <c:out value="${whiteboard.title}" escapeXml="true"/>
+					<c:out value="${whiteboard.title}" escapeXml="true"/>
 				</h4>
 			</c:otherwise>
 		</c:choose>
-	
-	
+
+
 		<c:if test="${empty summaryList}">
 			<lams:Alert type="info" id="no-session-summary" close="false">
-				 <fmt:message key="message.monitoring.summary.no.session" />
+				<fmt:message key="message.monitoring.summary.no.session" />
 			</lams:Alert>
 		</c:if>
-		
+
 		<!--For release marks feature-->
 		<i class="fa fa-spinner" style="display:none" id="message-area-busy"></i>
 		<div id="message-area"></div>
 	</div>
-	
+
 	<c:if test="${not empty summaryList and whiteboard.galleryWalkEnabled}">
 		<div class="panel panel-default ${whiteboard.galleryWalkFinished and not whiteboard.galleryWalkReadOnly ? 'gallery-walk-panel-ratings' : ''}"
 			 id="gallery-walk-panel">
-		  <div class="panel-heading">
-		    <h3 class="panel-title">
-				<fmt:message key="label.gallery.walk" />&nbsp;
-				<b>
-					<c:choose>
-						<c:when test="${not whiteboard.galleryWalkStarted and not whiteboard.galleryWalkFinished}">
-							<fmt:message key="label.gallery.walk.state.not.started" />
-						</c:when>
-						<c:when test="${whiteboard.galleryWalkStarted and not whiteboard.galleryWalkFinished}">
-							<fmt:message key="label.gallery.walk.state.started" />
-						</c:when>
-						<c:when test="${whiteboard.galleryWalkFinished}">
-							<fmt:message key="label.gallery.walk.state.finished" />
-						</c:when>
-					</c:choose>
-					<c:if test="${whiteboard.galleryWalkEditEnabled}">
-						<fmt:message key="label.gallery.walk.state.learner.edit.enabled" />
-					</c:if>
-				</b>
-			</h3>
-		  </div>
-		  <div class="panel-body">
-		   		<button id="gallery-walk-start" type="button"
-				        class="btn btn-primary
+			<div class="panel-heading">
+				<h3 class="panel-title">
+					<fmt:message key="label.gallery.walk" />&nbsp;
+					<b>
+						<c:choose>
+							<c:when test="${not whiteboard.galleryWalkStarted and not whiteboard.galleryWalkFinished}">
+								<fmt:message key="label.gallery.walk.state.not.started" />
+							</c:when>
+							<c:when test="${whiteboard.galleryWalkStarted and not whiteboard.galleryWalkFinished}">
+								<fmt:message key="label.gallery.walk.state.started" />
+							</c:when>
+							<c:when test="${whiteboard.galleryWalkFinished}">
+								<fmt:message key="label.gallery.walk.state.finished" />
+							</c:when>
+						</c:choose>
+						<c:if test="${whiteboard.galleryWalkEditEnabled}">
+							<fmt:message key="label.gallery.walk.state.learner.edit.enabled" />
+						</c:if>
+					</b>
+				</h3>
+			</div>
+			<div class="panel-body">
+				<button id="gallery-walk-start" type="button"
+						class="btn btn-primary
 				        	   ${not whiteboard.galleryWalkStarted and not whiteboard.galleryWalkFinished ? '' : 'hidden'}"
-				        onClick="javascript:startGalleryWalk()">
-					<fmt:message key="monitoring.summary.gallery.walk.start" /> 
+						onClick="javascript:startGalleryWalk()">
+					<fmt:message key="monitoring.summary.gallery.walk.start" />
 				</button>
-				
+
 				<button id="gallery-walk-finish" type="button"
-				        class="btn btn-primary ${whiteboard.galleryWalkStarted and not whiteboard.galleryWalkFinished ? '' : 'hidden'}"
-				        onClick="javascript:finishGalleryWalk()">
-					<fmt:message key="monitoring.summary.gallery.walk.finish" /> 
+						class="btn btn-primary ${whiteboard.galleryWalkStarted and not whiteboard.galleryWalkFinished ? '' : 'hidden'}"
+						onClick="javascript:finishGalleryWalk()">
+					<fmt:message key="monitoring.summary.gallery.walk.finish" />
 				</button>
-				
+
 				<br>
-							
+
 				<button id="gallery-walk-learner-edit" type="button"
-				        class="btn btn-default ${not whiteboard.galleryWalkEditEnabled and (whiteboard.galleryWalkStarted or whiteboard.galleryWalkFinished) ? '' : 'hidden'}"
-				        onClick="javascript:enableGalleryWalkLearnerEdit()">
-					<fmt:message key="monitoring.summary.gallery.walk.learner.edit" /> 
+						class="btn btn-default ${not whiteboard.galleryWalkEditEnabled and (whiteboard.galleryWalkStarted or whiteboard.galleryWalkFinished) ? '' : 'hidden'}"
+						onClick="javascript:enableGalleryWalkLearnerEdit()">
+					<fmt:message key="monitoring.summary.gallery.walk.learner.edit" />
 				</button>
-				
+
 				<c:if test="${whiteboard.galleryWalkFinished and not whiteboard.galleryWalkReadOnly}">
 					<h4 style="text-align: center"><fmt:message key="label.gallery.walk.ratings.header" /></h4>
 					<table id="gallery-walk-rating-table" class="table table-hover table-condensed">
-					  <thead class="thead-light">
-					    <tr>
-					      <th scope="col"><fmt:message key="monitoring.label.group" /></th>
-					      <th scope="col"><fmt:message key="label.rating" /></th>
-					    </tr>
-					  </thead>
-					  <tbody>
+						<thead class="thead-light">
+						<tr>
+							<th scope="col"><fmt:message key="monitoring.label.group" /></th>
+							<th scope="col"><fmt:message key="label.rating" /></th>
+						</tr>
+						</thead>
+						<tbody>
 						<c:forEach var="groupSummary" items="${summaryList}">
 							<tr>
 								<td>${groupSummary.sessionName}</td>
 								<td>
-									<lams:Rating itemRatingDto="${groupSummary.itemRatingDto}" 
+									<lams:Rating itemRatingDto="${groupSummary.itemRatingDto}"
 												 isItemAuthoredByUser="true"
 												 hideCriteriaTitle="true" />
 								</td>
 							</tr>
 						</c:forEach>
-					  </tbody>
+						</tbody>
 					</table>
 				</c:if>
-		  </div>
+			</div>
 		</div>
 	</c:if>
-	
+
 	<c:if test="${sessionMap.isGroupedActivity}">
-		<div class="panel-group" id="accordionSessions" role="tablist" aria-multiselectable="true"> 
-	</c:if>
-	
-	<c:forEach var="groupSummary" items="${summaryList}" varStatus="status">
-		<c:choose>
-			<c:when test="${sessionMap.isGroupedActivity}">		
-			    <div class="panel panel-default" >
-		        <div class="panel-heading" id="heading${groupSummary.sessionId}">
+	<div class="panel-group" id="accordionSessions" role="tablist" aria-multiselectable="true">
+		</c:if>
+
+		<c:forEach var="groupSummary" items="${summaryList}" varStatus="status">
+			<c:choose>
+				<c:when test="${sessionMap.isGroupedActivity}">
+					<div class="panel panel-default" >
+					<div class="panel-heading" id="heading${groupSummary.sessionId}">
 		        	<span class="panel-title collapsable-icon-left">
-		        		<a class="collapsed" role="button" data-toggle="collapse" href="#collapse${groupSummary.sessionId}" 
-								aria-expanded="false" aria-controls="collapse${groupSummary.sessionId}" >
+		        		<a class="collapsed" role="button" data-toggle="collapse" href="#collapse${groupSummary.sessionId}"
+						   aria-expanded="false" aria-controls="collapse${groupSummary.sessionId}" >
 							<fmt:message key="monitoring.label.group" />&nbsp;${groupSummary.sessionName}
 						</a>
 					</span>
-					<c:if test="${whiteboard.useSelectLeaderToolOuput and groupSummary.numberOfLearners > 0 and not groupSummary.sessionFinished}">
-						<button type="button" class="btn btn-default btn-xs pull-right"
+						<c:if test="${whiteboard.useSelectLeaderToolOuput and groupSummary.numberOfLearners > 0 and not groupSummary.sessionFinished}">
+							<button type="button" class="btn btn-default btn-xs pull-right"
+									onClick="javascript:showChangeLeaderModal(${groupSummary.sessionId})">
+								<fmt:message key='label.monitoring.change.leader'/>
+							</button>
+						</c:if>
+					</div>
+
+					<div id="collapse${groupSummary.sessionId}" class="panel-collapse collapse whiteboard-collapse"
+					role="tabpanel" aria-labelledby="heading${groupSummary.sessionId}">
+				</c:when>
+				<c:when test="${whiteboard.useSelectLeaderToolOuput and groupSummary.numberOfLearners > 0 and not groupSummary.sessionFinished}">
+					<div style="text-align: right">
+						<button type="button" class="btn btn-default" style="margin-bottom: 10px"
 								onClick="javascript:showChangeLeaderModal(${groupSummary.sessionId})">
 							<fmt:message key='label.monitoring.change.leader'/>
 						</button>
-					</c:if>
-		        </div>
-		        
-		        <div id="collapse${groupSummary.sessionId}" class="panel-collapse collapse whiteboard-collapse" 
-		        	 role="tabpanel" aria-labelledby="heading${groupSummary.sessionId}">
-			</c:when>
-			<c:when test="${whiteboard.useSelectLeaderToolOuput and groupSummary.numberOfLearners > 0 and not groupSummary.sessionFinished}">
-				<div style="text-align: right">
-					<button type="button" class="btn btn-default" style="margin-bottom: 10px"
-							onClick="javascript:showChangeLeaderModal(${groupSummary.sessionId})">
-						<fmt:message key='label.monitoring.change.leader'/>
-					</button>
+					</div>
+				</c:when>
+			</c:choose>
+
+			<div class="full-screen-content-div">
+				<div class="full-screen-flex-div">
+					<a href="#" class="btn btn-default fixed-button-width pull-right full-screen-launch-button" onclick="javascript:launchIntoFullscreen(this)"
+					   title="<fmt:message key='label.fullscreen.open' />">
+						<i class="fa fa-arrows-alt" aria-hidden="true"></i>
+					</a>
+					<a href="#" class="btn btn-default fixed-button-width pull-right full-screen-exit-button" onclick="javascript:exitFullscreen()"
+					   title="<fmt:message key='label.fullscreen.close' />">
+						<i class="fa fa-compress" aria-hidden="true"></i>
+					</a>
+					<div class="full-screen-main-div">
+							<%-- If there is no grouping, data is loaded immediately.
+                                 If there is grouping, data is loaded on panel expand. --%>
+						<iframe class="whiteboard-frame"
+								${sessionMap.isGroupedActivity ? "data-" : ""}src='${whiteboardServerUrl}/?whiteboardid=${groupSummary.wid}&username=${whiteboardAuthorName}${empty groupSummary.accessToken ? "" : "&accesstoken=".concat(groupSummary.accessToken)}&copyfromwid=${sourceWid}${empty whiteboardCopyAccessToken ? "" : "&copyaccesstoken=".concat(groupSummary.copyAccessToken)}'>
+						</iframe>
+					</div>
 				</div>
-			</c:when>
-		</c:choose>
-		
-		<div class="full-screen-content-div">
-			<div class="full-screen-flex-div">
-				<a href="#" class="btn btn-default fixed-button-width pull-right full-screen-launch-button" onclick="javascript:launchIntoFullscreen(this)"
-				   title="<fmt:message key='label.fullscreen.open' />">
-					<i class="fa fa-arrows-alt" aria-hidden="true"></i>
-				</a> 
-		       	<a href="#" class="btn btn-default fixed-button-width pull-right full-screen-exit-button" onclick="javascript:exitFullscreen()"
-				   title="<fmt:message key='label.fullscreen.close' />">
-		       		<i class="fa fa-compress" aria-hidden="true"></i>
-		       	</a>
-		       	<div class="full-screen-main-div">
-					<%-- If there is no grouping, data is loaded immediately.
-					     If there is grouping, data is loaded on panel expand. --%>
-					<iframe class="whiteboard-frame"
-							${sessionMap.isGroupedActivity ? "data-" : ""}src='${whiteboardServerUrl}/?whiteboardid=${groupSummary.wid}&username=${whiteboardAuthorName}${empty groupSummary.accessToken ? "" : "&accesstoken=".concat(groupSummary.accessToken)}&copyfromwid=${sourceWid}${empty whiteboardCopyAccessToken ? "" : "&copyaccesstoken=".concat(groupSummary.copyAccessToken)}'>
-					</iframe>		
-				</div>
 			</div>
-		</div>
 
-		<!-- Editable marks section -->
-		<div class="voffset10">	
-			<h4>
-			   <fmt:message key="label.monitoring.learner.marks.header"/>
-			</h4>
-			<lams:TSTable numColumns="2" dataId='toolSessionId="${groupSummary.sessionId}"'>
-				<th><fmt:message key="label.monitoring.learner.marks.name"/></th>
-				<th><fmt:message key="label.monitoring.learner.marks.mark"/>&nbsp;
-					<small><fmt:message key="label.monitoring.learner.marks.mark.tip"/></small>
-				</th>
-			</lams:TSTable>
-		</div>
-		
+			<!-- Editable marks section -->
+			<div class="voffset10">
+				<h4>
+					<fmt:message key="label.monitoring.learner.marks.header"/>
+				</h4>
+				<lams:TSTable numColumns="2" dataId='toolSessionId="${groupSummary.sessionId}"'>
+					<th><fmt:message key="label.monitoring.learner.marks.name"/></th>
+					<th><fmt:message key="label.monitoring.learner.marks.mark"/>&nbsp;
+						<small><fmt:message key="label.monitoring.learner.marks.mark.tip"/></small>
+					</th>
+				</lams:TSTable>
+			</div>
+
+			<c:if test="${sessionMap.isGroupedActivity}">
+				</div> <!-- end collapse area  -->
+				</div> <!-- end collapse panel  -->
+			</c:if>
+			${ !sessionMap.isGroupedActivity || ! status.last ? '<div class="voffset5">&nbsp;</div>' :  ''}
+
+		</c:forEach>
+
 		<c:if test="${sessionMap.isGroupedActivity}">
-			</div> <!-- end collapse area  -->
-			</div> <!-- end collapse panel  -->
-		</c:if>
-		${ !sessionMap.isGroupedActivity || ! status.last ? '<div class="voffset5">&nbsp;</div>' :  ''}
-		
-	</c:forEach>
-	
-	<c:if test="${sessionMap.isGroupedActivity}">
-		</div> <!--  end accordianSessions --> 
+	</div> <!--  end accordianSessions -->
 	</c:if>
-		
+
 	<c:if test="${sessionMap.whiteboard.reflectOnActivity}">
 		<%@ include file="reflections.jsp"%>
 	</c:if>
-	
+
 	<c:if test="${not isTbl}">
 		<%@ include file="advanceoptions.jsp"%>
 	</c:if>
 
 	<div id="time-limit-panel-placeholder"></div>
-			
+
 	<%@ include file="dateRestriction.jsp"%>
-	
+
 	<div id="change-leader-modals"></div>
 </div>
\ No newline at end of file