Index: lams_tool_whiteboard/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r85a2af65cb5f008ebb4f38b1431b7f9482330f4b -r07b4e1abe3959528eaeb5c819d24f3930ce6733c
--- lams_tool_whiteboard/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 85a2af65cb5f008ebb4f38b1431b7f9482330f4b)
+++ lams_tool_whiteboard/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 07b4e1abe3959528eaeb5c819d24f3930ce6733c)
@@ -1,669 +1,90 @@
-<%@ include file="/common/taglibs.jsp"%>
-<c:set var="lams"><lams:LAMSURL /></c:set>
-<c:set var="sessionMap" value="${sessionScope[sessionMapID]}"/>
-<c:set var="summaryList" value="${sessionMap.summaryList}"/>
-<c:set var="whiteboard" value="${sessionMap.whiteboard}" />
+package org.lamsfoundation.lams.util.hibernate;
 
-<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="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>
+import org.apache.log4j.Logger;
+import org.hibernate.Cache;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.context.internal.ManagedSessionContext;
+import org.hibernate.stat.Statistics;
+import org.lamsfoundation.lams.web.session.SessionManager;
+import org.springframework.orm.hibernate5.SessionHolder;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
 
-<%@ page import="org.lamsfoundation.lams.tool.whiteboard.WhiteboardConstants"%>
+/**
+* Helper for Hibernate sessions.
+*
+* @author Marcin Cieslak
+*/
+public class HibernateSessionManager {
+private static SessionFactory sessionFactory;
 
-<lams:css suffix="jquery.jRating"/>
-<link href="${lams}css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css">
-<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">
+private static Logger log = Logger.getLogger(HibernateSessionManager.class);
 
-<style media="screen,projection" type="text/css">
+/**
+* Makes sure that an open Hibernate session is bound to current thread.
+*/
+public static void openSession() throws IllegalStateException {
+SessionFactory sessionFactory = HibernateSessionManager.getSessionFactory();
+// this call does not only fetch current session
+// if an open session is missing from Context, it creates it and binds it
+// with TransactionAwareSessionContext#currentSession()
+Session session = sessionFactory.getCurrentSession();
+if (!session.isOpen()) {
+ManagedSessionContext.unbind(sessionFactory);
+TransactionSynchronizationManager.unbindResourceIfPossible(sessionFactory);
+session = sessionFactory.getCurrentSession();
+}
+SessionHolder sessionHolder = (SessionHolder) TransactionSynchronizationManager.getResource(sessionFactory);
+if (sessionHolder == null) {
+sessionHolder = new SessionHolder(session);
+TransactionSynchronizationManager.bindResource(sessionFactory, sessionHolder);
+}
+}
 
-	.whiteboard-monitoring-summary .countdown-timeout {
-		color: #FF3333 !important;
-	}
+public static void closeSession() throws IllegalStateException {
+Session session = HibernateSessionManager.getSessionFactory().getCurrentSession();
+if (session.isOpen()) {
+session.close();
+}
+}
 
-	.whiteboard-monitoring-summary #time-limit-table th {
-		vertical-align: middle;
-	}
+public static void openSessionIfNecessary() {
+// this call does not only fetch current session
+// if an open session is missing from Context, it creates it and binds it
+// with TransactionAwareSessionContext#currentSession()
+HibernateSessionManager.getSessionFactory().getCurrentSession();
+}
 
-	.whiteboard-monitoring-summary #time-limit-table td.centered {
-		text-align: center;
-	}
+public static Statistics getStatistics() {
+return HibernateSessionManager.getSessionFactory().getStatistics();
+}
 
-	.whiteboard-monitoring-summary .panel {
-		overflow: auto;
-	}
+public static boolean clearCache() {
+try {
+Session session = HibernateSessionManager.getSessionFactory().getCurrentSession();
+if (session != null) {
+session.clear();
+}
 
-	.whiteboard-monitoring-summary #control-buttons {
-		float: right;
-		margin-bottom: 20px;
-	}
+Cache cache = HibernateSessionManager.getSessionFactory().getCache();
+if (cache != null) {
+cache.evictAllRegions();
+}
+} catch (Exception e) {
+log.error("Error while clearing cache", e);
+return false;
+}
+return true;
+}
 
-	.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;
-	}
-
-	.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;
-	}
-
-	.whiteboard-monitoring-summary .ts-pager .btn {
-		background-color: #eee;
-	}
-	.whiteboard-monitoring-summary .tablesorter tfoot th {
-		background-color: #eee !important;
-	}
-
-	.whiteboard-monitoring-summary .pagesize {
-		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;
-	}
-
-	.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 {
-		height: 100%;
-		width: 100%;
-	}
-</style>
-
-<script>
-	// pass settings to monitorToolSummaryAdvanced.js
-	let submissionDeadlineSettings = {
-		lams: '<lams:LAMSURL />',
-		submissionDeadline: '${submissionDeadline}',
-		submissionDateString: '${submissionDateString}',
-		setSubmissionDeadlineUrl: '<c:url value="/monitoring/setSubmissionDeadline.do"/>?<csrf:token/>',
-		toolContentID: '<c:out value="${param.toolContentID}" />',
-		messageNotification: '<spring:escapeBody javaScriptEscape="true"><fmt:message key="monitor.summary.notification" /></spring:escapeBody>',
-		messageRestrictionSet: '<spring:escapeBody javaScriptEscape="true"><fmt:message key="monitor.summary.date.restriction.set" /></spring:escapeBody>',
-		messageRestrictionRemoved: '<spring:escapeBody javaScriptEscape="true"><fmt:message key="monitor.summary.date.restriction.removed" /></spring:escapeBody>'
-	};
-</script>
-<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.tablesorter-editable.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/jquery.countdown.js"></script>
-<lams:JSImport src="includes/javascript/portrait.js" />
-<script type="text/javascript" src="${lams}includes/javascript/fullscreen.js"></script>
-<lams:JSImport src="includes/javascript/monitorToolSummaryAdvanced.js" />
-<script type="text/javascript">
-	//var for jquery.jRating.js
-	var pathToImageFolder = "${lams}images/css/",
-			//vars for rating.js
-			AVG_RATING_LABEL = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.average.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param></fmt:message></spring:escapeBody>',
-			YOUR_RATING_LABEL = '<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.your.rating"><fmt:param>@1@</fmt:param><fmt:param>@2@</fmt:param><fmt:param>@3@</fmt:param></fmt:message></spring:escapeBody>',
-			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(){
-			var whiteboard = $('.whiteboard-frame', this);
-			if (whiteboard.data('src')) {
-				whiteboard.attr('src', whiteboard.data('src'));
-				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";><spring:escapeBody javaScriptEscape="true"><fmt:message key="label.pad.started.fixing" /></spring:escapeBody></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('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.pad.fixed" /></spring:escapeBody>');
-					alert('<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.pad.fixed" /></spring:escapeBody>');
-				},
-				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
-			}
-		});
-
-		// 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);
-				}
-
-				$.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('<spring:escapeBody javaScriptEscape="true"><fmt:message key="messsage.monitoring.learner.marks.update.fail" /></spring:escapeBody>');
-					}
-				});
-
-			});
-		});
-
-		// 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',
-				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 = {};
-
-
-						for (i = 0; i < data.rows.length; i++){
-							var userData = data.rows[i],
-									isLeader = userData['isLeader'];
-
-							rows += '<tr userId="' + userData['userId'] + '" ' + (isLeader ? 'class="info"' : '') + '>';
-
-							rows += '<td style="width: 80%">';
-							rows += 	userData['firstName'] + ' ' +userData['lastName'];
-							if (isLeader) {
-								rows += '&nbsp;<i title="<spring:escapeBody javaScriptEscape="true"><fmt:message key="label.monitoring.team.leader"/></spring:escapeBody>" 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), '<spring:escapeBody javaScriptEscape="true"><fmt:message key="messsage.monitoring.learner.marks.no.data"/></spring:escapeBody>');
-						}
-					});
-		});
-
-		<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);
-		</c:if>
-
-		setupFullScreenEvents();
-
-		$('#time-limit-panel-placeholder').load('${timeLimitPanelUrl}');
-	});
-
-	function startGalleryWalk(){
-		if (!confirm('<spring:escapeBody javaScriptEscape="true"><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:choose>
-			}
-		});
-	}
-
-	function finishGalleryWalk(){
-		if (!confirm('<spring:escapeBody javaScriptEscape="true"><fmt:message key="monitoring.summary.gallery.walk.finish.confirm" /></spring:escapeBody>')) {
-			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:choose>
-			}
-		});
-	}
-
-	function enableGalleryWalkLearnerEdit(){
-		if (!confirm('<spring:escapeBody javaScriptEscape="true"><fmt:message key="monitoring.summary.gallery.walk.learner.edit.confirm" /></spring:escapeBody>')) {
-			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:choose>
-			}
-		});
-	}
-
-	function showChangeLeaderModal(toolSessionId) {
-		$('#whiteboard-monitoring-summary-${sessionMap.toolContentID} #change-leader-modals').empty()
-				.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("<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.monitoring.leader.successfully.changed'/></spring:escapeBody>");
-				},
-				error : function(){
-					alert("<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.monitoring.leader.not.changed'/></spring:escapeBody>");
-				}
-			});
-
-		} else {
-			alert("<spring:escapeBody javaScriptEscape='true'><fmt:message key='label.monitoring.leader.not.changed'/></spring:escapeBody>");
-		}
-	}
-
-</script>
-<lams:JSImport src="includes/javascript/rating.js" />
-<script type="text/javascript" src="${lams}includes/javascript/jquery.jRating.js"></script>
-
-<!-- Extra container div to isolate content from multiple Application Excercise tabs in TBL monitoring -->
-<div id="whiteboard-monitoring-summary-${sessionMap.toolContentID}" class="whiteboard-monitoring-summary">
-	<div class="panel">
-		<c:choose>
-			<c:when test="${isTbl}">
-				<div class="row attendance-row">
-					<div class="col-xs-6 col-sm-4">
-						<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>
-							</div>
-						</div>
-					</div>
-				</div>
-			</c:when>
-			<c:otherwise>
-				<h4>
-					<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" />
-			</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
-				        	   ${not whiteboard.galleryWalkStarted and not whiteboard.galleryWalkFinished ? '' : 'hidden'}"
-						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" />
-				</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" />
-				</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>
-						<c:forEach var="groupSummary" items="${summaryList}">
-							<tr>
-								<td>${groupSummary.sessionName}</td>
-								<td>
-									<lams:Rating itemRatingDto="${groupSummary.itemRatingDto}"
-												 isItemAuthoredByUser="true"
-												 hideCriteriaTitle="true" />
-								</td>
-							</tr>
-						</c:forEach>
-						</tbody>
-					</table>
-				</c:if>
-			</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}">
-		        	<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}" >
-							<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"
-									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>
-			</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 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
+private static SessionFactory getSessionFactory() {
+if (HibernateSessionManager.sessionFactory == null) {
+WebApplicationContext wac = WebApplicationContextUtils
+.getRequiredWebApplicationContext(SessionManager.getServletContext());
+HibernateSessionManager.sessionFactory = (SessionFactory) wac.getBean("coreSessionFactory");
+}
+return HibernateSessionManager.sessionFactory;
+}
+}
\ No newline at end of file