Index: lams_common/src/java/org/lamsfoundation/lams/util/CommonConstants.java
===================================================================
diff -u -r89279cb44b252167269043889b3c3c0a4164e0bb -r0c0c19b682e95c31de267d8e3a7d8b174c9c511a
--- lams_common/src/java/org/lamsfoundation/lams/util/CommonConstants.java	(.../CommonConstants.java)	(revision 89279cb44b252167269043889b3c3c0a4164e0bb)
+++ lams_common/src/java/org/lamsfoundation/lams/util/CommonConstants.java	(.../CommonConstants.java)	(revision 0c0c19b682e95c31de267d8e3a7d8b174c9c511a)
@@ -44,6 +44,7 @@
     public static final String HEADER_CONTENT_ATTACHMENT = "attachment;filename=";
 
     public static final String TOOL_SIGNATURE_ASSESSMENT = "laasse10";
+    public static final String TOOL_SIGNATURE_DOKU = "ladoku11";
     public static final String TOOL_SIGNATURE_FORUM = "lafrum11";
     public static final String TOOL_SIGNATURE_LEADERSELECTION = "lalead11";
     public static final String TOOL_SIGNATURE_MCQ = "lamc11";
Index: lams_monitoring/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r752da4bc77129305245c4c8cf9f63f5f6c6deb4e -r0c0c19b682e95c31de267d8e3a7d8b174c9c511a
--- lams_monitoring/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 752da4bc77129305245c4c8cf9f63f5f6c6deb4e)
+++ lams_monitoring/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 0c0c19b682e95c31de267d8e3a7d8b174c9c511a)
@@ -422,6 +422,7 @@
 label.burning.questions = Burning Qs
 label.forum = Forum
 label.aes = AEs
+label.aes.questions.marks = AE Questions & Marks
 label.sequence = Sequence
 label.sequence.diagram = Design
 label.refresh = Refresh
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java
===================================================================
diff -u -rec9b0ffc2e88f3504fd7505ee8474f86d89a2458 -r0c0c19b682e95c31de267d8e3a7d8b174c9c511a
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java	(.../TblMonitoringController.java)	(revision ec9b0ffc2e88f3504fd7505ee8474f86d89a2458)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java	(.../TblMonitoringController.java)	(revision 0c0c19b682e95c31de267d8e3a7d8b174c9c511a)
@@ -41,6 +41,7 @@
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 /**
@@ -259,6 +260,20 @@
     }
 
     /**
+     * Shows AEs page
+     */
+    @RequestMapping("/aes")
+    public String aes(HttpServletRequest request, Model model) {
+	String[] toolContentIds = request.getParameter("aeToolContentIds").split(",");
+	String[] activityTitles = request.getParameter("aeActivityTitles").split("\\,");
+
+	model.addAttribute("aeToolContentIds", toolContentIds);
+	model.addAttribute("aeActivityTitles", activityTitles);
+
+	return "tblmonitor/aes";
+    }
+
+    /**
      * Returns lesson activities sorted by the learning design order.
      */
     private List<Activity> getLessonActivities(Lesson lesson) {
@@ -369,8 +384,8 @@
 
 	boolean scratchiePassed = false;
 	boolean iraPassed = false;
-	String assessmentToolContentIds = "";
-	String assessmentActivityTitles = "";
+	String aeToolContentIds = "";
+	String aeActivityTitles = "";
 	for (Activity activity : activities) {
 	    if (activity instanceof ToolActivity) {
 		ToolActivity toolActivity = (ToolActivity) activity;
@@ -397,11 +412,12 @@
 
 		//aes are counted only after Scratchie activity, or for LKC TBL monitoring
 		if ((scratchiePassed || !isScratchieAvailable)
-			&& CommonConstants.TOOL_SIGNATURE_ASSESSMENT.equals(toolSignature)) {
+			&& (CommonConstants.TOOL_SIGNATURE_ASSESSMENT.equals(toolSignature)
+				|| CommonConstants.TOOL_SIGNATURE_DOKU.equals(toolSignature))) {
 		    request.setAttribute("isAeAvailable", true);
 		    //prepare assessment details to be passed to Assessment tool
-		    assessmentToolContentIds += toolContentId + ",";
-		    assessmentActivityTitles += toolTitle + "\\,";
+		    aeToolContentIds += toolContentId + ",";
+		    aeActivityTitles += toolTitle + "\\,";
 
 		} else if (CommonConstants.TOOL_SIGNATURE_FORUM.equals(toolSignature)) {
 		    request.setAttribute("isForumAvailable", true);
@@ -430,7 +446,7 @@
 	    }
 	}
 
-	request.setAttribute("assessmentToolContentIds", assessmentToolContentIds);
-	request.setAttribute("assessmentActivityTitles", assessmentActivityTitles);
+	request.setAttribute("aeToolContentIds", aeToolContentIds);
+	request.setAttribute("aeActivityTitles", aeActivityTitles);
     }
 }
\ No newline at end of file
Index: lams_monitoring/web/tblmonitor/aes.jsp
===================================================================
diff -u
--- lams_monitoring/web/tblmonitor/aes.jsp	(revision 0)
+++ lams_monitoring/web/tblmonitor/aes.jsp	(revision 0c0c19b682e95c31de267d8e3a7d8b174c9c511a)
@@ -0,0 +1,69 @@
+<%@ include file="/taglibs.jsp"%>
+<% pageContext.setAttribute("newLineChar", "\r\n"); %>
+
+<style>
+	.tab-pane {
+		padding-top: 10px;
+	}
+</style>
+<script>
+	var tblSelectedAeToolContentId = tblSelectedAeToolContentId || '${empty param.toolContentID ? aeToolContentIds[0] : param.toolContentID}';
+
+	$(document).ready(function(){
+		$('#aes-tab .tab-pane').each(function(){
+			var aePane = $(this),
+				toolContentId = aePane.data('toolContentId'),
+				nav = $('#aes-tab .nav-tabs a[data-tool-content-id="' + toolContentId + '"]').closest('li');
+
+			// load AE tab content for the given tool content ID
+			aePane.load("<lams:LAMSURL/>tool/laasse10/tblmonitoring/ae.do?toolContentID="  + toolContentId);
+
+			// re-select the previous tab or stick to whatever is in the parameter
+			if (toolContentId == tblSelectedAeToolContentId) {
+				aePane.addClass('active');
+				nav.addClass('active');
+			} else {
+				aePane.removeClass('active');
+				nav.removeClass('active');
+			}
+		});
+
+		// change attempted and all learners numbers
+		$('#aes-tab .nav-tabs').bind('click', function (event) {
+			var link = $(event.target);
+			// store which tab was cliked last
+			tblSelectedAeToolContentId = link.data("tool-content-id");
+		});
+	});
+</script>
+<div id="aes-tab">
+	<!-- Header -->
+	<div class="row">
+		<div class="col-xs-12">
+			<h3>
+				<fmt:message key="label.aes.questions.marks"/>
+			</h3>
+		</div>
+	</div>
+	<!-- End header -->    
+	
+	<ul class="nav nav-tabs">
+		<c:forEach var="aeToolContentId" items="${aeToolContentIds}" varStatus="status">
+			<li>
+				<a data-toggle="tab" href="#ae-pane-${aeToolContentId}" 
+				   data-tool-content-id="${aeToolContentId}">
+					<c:out value="${aeActivityTitles[status.index]}" escapeXml="false"/>
+				</a>
+			</li>
+		</c:forEach>
+	</ul>
+			
+	<div class="tab-content">
+		<c:forEach var="aeToolContentId" items="${aeToolContentIds}" varStatus="status">
+			<div id="ae-pane-${aeToolContentId}"
+				 class="tab-pane"
+				 data-tool-content-id="${aeToolContentId}">
+			</div>
+		</c:forEach>
+	</div>
+</div>
\ No newline at end of file
Index: lams_monitoring/web/tblmonitor/tblmonitor.jsp
===================================================================
diff -u -rd642e043e5cec55215c6e5dba9a1d779dca16665 -r0c0c19b682e95c31de267d8e3a7d8b174c9c511a
--- lams_monitoring/web/tblmonitor/tblmonitor.jsp	(.../tblmonitor.jsp)	(revision d642e043e5cec55215c6e5dba9a1d779dca16665)
+++ lams_monitoring/web/tblmonitor/tblmonitor.jsp	(.../tblmonitor.jsp)	(revision 0c0c19b682e95c31de267d8e3a7d8b174c9c511a)
@@ -91,13 +91,14 @@
 				toolContentID = "${iraToolContentId}";
 				url = "<lams:LAMSURL/>tool/laasse10/tblmonitoring/";
 	
-			} else if (method == "aes" || method == "aesStudentChoices") {
-				url = "<lams:LAMSURL/>tool/laasse10/tblmonitoring/";
+			} else if (method == "aes") {
 				options = {
-					assessmentToolContentIds: "${assessmentToolContentIds}",
-					assessmentActivityTitles: "${assessmentActivityTitles}"
+					aeToolContentIds: "${aeToolContentIds}",
+					aeActivityTitles: "${aeActivityTitles}"
 				};
 
+			} else if (method == "aesStudentChoices") {
+				url = "<lams:LAMSURL/>tool/laasse10/tblmonitoring/";
 			} else if (method == "forum") {
 				options = {
 					activityId: "${forumActivityId}"
Index: lams_tool_assessment/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r06890c4feb9daa16dcea27bc2d38a31c42b33a59 -r0c0c19b682e95c31de267d8e3a7d8b174c9c511a
--- lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 06890c4feb9daa16dcea27bc2d38a31c42b33a59)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 0c0c19b682e95c31de267d8e3a7d8b174c9c511a)
@@ -310,7 +310,6 @@
 label.confidence = Confidence
 label.no.question.references = No questions have been added to the question list. Do you still want to proceed with no questions?
 label.hide.name.column = Hide name column
-label.ae.questions.marks = AE Questions & Marks
 label.ira.questions.marks = iRAT Questions & Marks
 label.attendance = Attendance
 label.show.students.choices = Show students' choices
Index: lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r06890c4feb9daa16dcea27bc2d38a31c42b33a59 -r0c0c19b682e95c31de267d8e3a7d8b174c9c511a
--- lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 06890c4feb9daa16dcea27bc2d38a31c42b33a59)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 0c0c19b682e95c31de267d8e3a7d8b174c9c511a)
@@ -310,7 +310,6 @@
 label.confidence = Confidence
 label.no.question.references = No questions have been added to the question list. Do you still want to proceed with no questions?
 label.hide.name.column = Hide name column
-label.ae.questions.marks = AE Questions & Marks
 label.ira.questions.marks = iRAT Questions & Marks
 label.attendance = Attendance
 label.show.students.choices = Show students' choices
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java
===================================================================
diff -u -rd0d996208245ee5ce5cefa9c16b942505d0e52e6 -r0c0c19b682e95c31de267d8e3a7d8b174c9c511a
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java	(.../TblMonitoringController.java)	(revision d0d996208245ee5ce5cefa9c16b942505d0e52e6)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java	(.../TblMonitoringController.java)	(revision 0c0c19b682e95c31de267d8e3a7d8b174c9c511a)
@@ -35,7 +35,9 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 
 @Controller
 @RequestMapping("/tblmonitoring")
@@ -172,20 +174,18 @@
     }
 
     /**
-     * Shows aes page
+     * Shows ae page
      */
-    @RequestMapping("aes")
-    public String aes(HttpServletRequest request) {
-	String[] toolContentIds = request.getParameter("assessmentToolContentIds").split(",");
-	String[] activityTitles = request.getParameter("assessmentActivityTitles").split("\\,");
+    @RequestMapping("ae")
+    public String ae(@RequestParam(name = AttributeNames.PARAM_TOOL_CONTENT_ID) long toolContentId, Model model) {
+	Assessment assessment = assessmentService.getAssessmentByContentId(toolContentId);
+	model.addAttribute(AttributeNames.PARAM_TOOL_CONTENT_ID, toolContentId);
+	model.addAttribute("allowDiscloseAnswers", assessment.isAllowDiscloseAnswers());
+	
+	int attemptedLearnersNumber = assessmentService.getCountUsersByContentId(toolContentId);
+	model.addAttribute("attemptedLearnersNumber", attemptedLearnersNumber);
 
-	List<TblAssessmentDTO> assessmentDtos = getAssessmentDtos(toolContentIds, activityTitles);
-	request.setAttribute("assessmentDtos", assessmentDtos);
-
-	Long toolContentId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID, true);
-	request.setAttribute(AttributeNames.PARAM_TOOL_CONTENT_ID, toolContentId);
-
-	return "pages/tblmonitoring/assessment";
+	return "pages/tblmonitoring/ae";
     }
 
     /**
Index: lams_tool_assessment/web/pages/tblmonitoring/ae.jsp
===================================================================
diff -u
--- lams_tool_assessment/web/pages/tblmonitoring/ae.jsp	(revision 0)
+++ lams_tool_assessment/web/pages/tblmonitoring/ae.jsp	(revision 0c0c19b682e95c31de267d8e3a7d8b174c9c511a)
@@ -0,0 +1,147 @@
+<%@ include file="/common/taglibs.jsp"%>
+<% pageContext.setAttribute("newLineChar", "\r\n"); %>
+
+<script>
+	$(document).ready(function(){
+		var assessmentPane = $('#ae-pane-${toolContentID}');
+		//insert total learners number taken from the parent tblmonitor.jsp
+		$(".total-learners-number", assessmentPane).html(TOTAL_LESSON_LEARNERS_NUMBER);
+		loadResultsPane($('.results', assessmentPane), false);
+	});
+	
+	function loadResultsPane(resultsPane, isRefresh) {
+		var toolContentId = resultsPane.data('toolContentId');
+		// load an embedded results list
+		resultsPane.load("<c:url value='/learning/showResultsForTeacher.do'/>?embedded=true&toolContentID=" + toolContentId, function(){
+			var assessmentPane = $(this).closest('.tab-pane'),
+				// are any correct/groups buttons clickable?
+				discloseAllCorrectEnabled = false,
+				discloseAllGroupsEnabled = false; 
+			
+			// disclose correct/group answers on click
+			$('.disclose-button-group .btn', assessmentPane).not('[disabled]').each(function(){
+				let button = $(this),
+					isCorrectButton = button.hasClass('disclose-correct-button');
+				if (isCorrectButton) {
+					discloseAllCorrectEnabled = true;
+				} else {
+					discloseAllGroupsEnabled = true;
+				}
+				
+				
+				
+				button.click(function(event) {	
+					if (!confirm(isCorrectButton ? "<fmt:message key='message.disclose.correct.answers' />"
+												: "<fmt:message key='message.disclose.groups.answers' />")) {
+						return;
+					}
+					
+					discloseAnswers(button, resultsPane);
+				});
+			});
+	
+			// if disclose all correct/groups answers buttons are clickable, add a click handler
+			// and disable if not
+			var allCorrectButton = $('.disclose-all-correct-button', assessmentPane);
+			if (discloseAllCorrectEnabled) {
+				// do not add a handler twice
+				if (!isRefresh) {
+					allCorrectButton.click(function(){
+						if (!confirm("<fmt:message key='message.disclose.all.correct.answers' />")) {
+							return;
+						}
+						$('.disclose-correct-button', assessmentPane).not('[disabled]').each(function() {
+							discloseAnswers($(this), resultsPane);
+						});
+						disabledAndCheckButton(allCorrectButton);
+					});
+				}
+			} else {
+				disabledAndCheckButton(allCorrectButton);
+			}
+	
+			var allGroupsButton = $('.disclose-all-groups-button', assessmentPane);
+			if (discloseAllGroupsEnabled) {
+				// do not add a handler twice
+				if (!isRefresh) {
+					allGroupsButton.click(function(){
+						if (!confirm("<fmt:message key='message.disclose.all.groups.answers' />")) {
+							return;
+						}
+						$('.disclose-groups-button', assessmentPane).not('[disabled]').each(function() {
+							discloseAnswers($(this), resultsPane);
+						});
+						disabledAndCheckButton(allGroupsButton);
+					});
+				}
+			} else {
+				disabledAndCheckButton(allGroupsButton);
+			}
+		});
+	}
+	
+	function discloseAnswers(button, resultsPane) {
+		let isCorrectButton = button.hasClass('disclose-correct-button'),
+			toolContentId = resultsPane.data('toolContentId');
+		
+		$.ajax({
+			'url'  : '<lams:WebAppURL />monitoring/' 
+					  + (isCorrectButton ? 'discloseCorrectAnswers' : 'discloseGroupsAnswers')
+					  + '.do',
+			'type': 'POST',
+			'data' : {
+				'questionUid'   : button.closest('.disclose-button-group').attr('questionUid'),
+				'toolContentID' : toolContentId,
+				'<csrf:tokenname/>' : '<csrf:tokenvalue/>'
+			}
+		}).done(function(){
+			// reload results after disclosing answers
+			loadResultsPane(resultsPane, true);
+		});
+	}
+
+	function disabledAndCheckButton(button){
+		button.attr('disabled', true).html('<i class="fa fa-check text-success">&nbsp;</i>' + button.text());
+	}
+</script>
+
+
+				
+<!-- Notifications -->  
+<div class="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 class="col-xs-6 col-sm-8">
+		<div class="btn btn-sm btn-default pull-right" onclick="javascript:loadTab('aesStudentChoices', ${toolContentID})">
+			<i class="fa fa-file"></i>
+			<fmt:message key="label.show.students.choices"/>
+		</div>   
+	</div>                 
+</div>
+	
+<c:if test="${allowDiscloseAnswers}">
+	<%-- Release correct/groups answers for all questions in this assessment --%>
+	<div class="row">
+		<div class="col-xs-12 col-md-12 col-lg-12">
+			<div class="btn-group-sm pull-right disclose-all-button-group">
+				<div class="btn btn-default disclose-all-correct-button">
+					<fmt:message key="label.disclose.all.correct.answers"/>
+				</div>
+				<div class="btn btn-default disclose-all-groups-button">
+					<fmt:message key="label.disclose.all.groups.answers"/>
+				</div>
+			</div>
+		</div>
+	</div>
+</c:if>		
+
+		
+<div class="results" data-tool-content-id="${toolContentID}"></div>
\ No newline at end of file
Index: lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp
===================================================================
diff -u -rb50f7a1c4696df0cd6f88b74ee49fa5472061e0d -r0c0c19b682e95c31de267d8e3a7d8b174c9c511a
--- lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp	(.../assessment.jsp)	(revision b50f7a1c4696df0cd6f88b74ee49fa5472061e0d)
+++ lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp	(.../assessment.jsp)	(revision 0c0c19b682e95c31de267d8e3a7d8b174c9c511a)
@@ -1,14 +1,4 @@
 <%@ include file="/common/taglibs.jsp"%>
-<c:set var="method">
-	<c:choose>
-		<c:when test="${isIraAssessment}">
-			iraAssessmentStudentChoices
-		</c:when>
-		<c:otherwise>
-			aesStudentChoices
-		</c:otherwise>
-	</c:choose>
-</c:set>
 <% pageContext.setAttribute("newLineChar", "\r\n"); %>
 
 <script src="<lams:LAMSURL/>includes/javascript/chart.bundle.min.js"></script>
@@ -158,14 +148,7 @@
 <div class="row no-gutter">
 	<div class="col-xs-12 col-md-12 col-lg-8">
 		<h3>
-			<c:choose>
-				<c:when test="${isIraAssessment}">
-					<fmt:message key="label.ira.questions.marks"/>
-				</c:when>
-				<c:otherwise>
-					<fmt:message key="label.ae.questions.marks"/>
-				</c:otherwise>
-			</c:choose>
+			<fmt:message key="label.ira.questions.marks"/>
 		</h3>
 	</div>
 </div>
@@ -184,10 +167,10 @@
 		</div>
 	</div>
 
-	<c:if test="${method eq 'aesStudentChoices' or iraAttemptedByAnyLearners}">
+	<c:if test="${iraAttemptedByAnyLearners}">
 		<div class="col-xs-6 col-md-4 col-md-offset-4 col-lg-4 col-lg-offset-2">
 			<a href="#nogo" type="button" class="btn btn-sm btn-default buttons_column"
-					onclick="javascript:loadTab('${method}', document.getElementById('selected-content-id').value); return false;">
+					onclick="javascript:loadTab('iraAssessmentStudentChoices', document.getElementById('selected-content-id').value); return false;">
 				<i class="fa fa-file"></i>
 				<fmt:message key="label.show.students.choices"/>
 			</a>
@@ -197,21 +180,6 @@
 
 <div class="row no-gutter">
 	<input type="hidden" value="${assessmentDtos[0].assessment.contentId}" id="selected-content-id">
-	
-	<c:if test="${!isIraAssessment}">
-		<ul class="nav nav-tabs">
-			<c:forEach var="assessmentDto" items="${assessmentDtos}" varStatus="i">
-				<li <c:if test="${(i.index == 0 && toolContentID == null) || (toolContentID != null && assessmentDto.assessment.contentId == toolContentID)}">class="active"</c:if>>
-					<a data-toggle="tab" href="#assessment-${assessmentDto.assessment.uid}" 
-							data-attempted-learners-number="${assessmentDto.attemptedLearnersNumber}"
-							data-tool-content-id="${assessmentDto.assessment.contentId}">
-						<c:out value="${assessmentDto.activityTitle}" escapeXml="false"/>
-					</a>
-				</li>
-			</c:forEach>
-		</ul>
-	</c:if>
-		
 </div>
 <br>
 <!-- End notifications -->
Index: lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp
===================================================================
diff -u -ra8614f8bb8ccde5d2068b34659649c3c93c4e0d1 -r0c0c19b682e95c31de267d8e3a7d8b174c9c511a
--- lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp	(.../assessmentStudentChoices.jsp)	(revision a8614f8bb8ccde5d2068b34659649c3c93c4e0d1)
+++ lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp	(.../assessmentStudentChoices.jsp)	(revision 0c0c19b682e95c31de267d8e3a7d8b174c9c511a)
@@ -12,8 +12,34 @@
 	}
 </style>
 
+<script src="<lams:LAMSURL/>includes/javascript/chart.bundle.min.js"></script>
+<script src="<lams:WebAppURL />includes/javascript/chart.js"></script>
+	
 <script>
-	var activityCompletionChart = null,
+	var WEB_APP_URL = '<lams:WebAppURL />',
+	
+	LABELS = $.extend(LABELS, {
+		<fmt:message key="label.monitoring.summary.completion" var="ACTIVITY_COMPLETION_CHART_TITLE_VAR"/>
+		ACTIVITY_COMPLETION_CHART_TITLE : '<c:out value="${ACTIVITY_COMPLETION_CHART_TITLE_VAR}" />',
+		<fmt:message key="label.monitoring.summary.completion.possible" var="ACTIVITY_COMPLETION_CHART_POSSIBLE_LEARNERS_VAR"/>
+		ACTIVITY_COMPLETION_CHART_POSSIBLE_LEARNERS : '<c:out value="${ACTIVITY_COMPLETION_CHART_POSSIBLE_LEARNERS_VAR}" />',
+		<fmt:message key="label.monitoring.summary.completion.started" var="ACTIVITY_COMPLETION_CHART_STARTED_LEARNERS_VAR"/>
+		ACTIVITY_COMPLETION_CHART_STARTED_LEARNERS : '<c:out value="${ACTIVITY_COMPLETION_CHART_STARTED_LEARNERS_VAR}" />',	
+		<fmt:message key="label.monitoring.summary.completion.completed" var="ACTIVITY_COMPLETION_CHART_COMPLETED_LEARNERS_VAR"/>
+		ACTIVITY_COMPLETION_CHART_COMPLETED_LEARNERS : '<c:out value="${ACTIVITY_COMPLETION_CHART_COMPLETED_LEARNERS_VAR}" />',	
+		<fmt:message key="label.monitoring.summary.answered.questions" var="ANSWERED_QUESTIONS_CHART_TITLE_VAR"/>
+		ANSWERED_QUESTIONS_CHART_TITLE : '<c:out value="${ANSWERED_QUESTIONS_CHART_TITLE_VAR}" />',
+		<fmt:message key="label.monitoring.summary.answered.questions.groups" var="ANSWERED_QUESTIONS_CHART_TITLE_GROUPS_VAR"/>
+		ANSWERED_QUESTIONS_CHART_TITLE_GROUPS : '<c:out value="${ANSWERED_QUESTIONS_CHART_TITLE_GROUPS_VAR}" />',
+		<fmt:message key="label.monitoring.summary.answered.questions.x.axis" var="ANSWERED_QUESTIONS_CHART_X_AXIS_VAR"/>
+		ANSWERED_QUESTIONS_CHART_X_AXIS : '<c:out value="${ANSWERED_QUESTIONS_CHART_X_AXIS_VAR}" />',
+		<fmt:message key="label.monitoring.summary.answered.questions.y.axis.students" var="ANSWERED_QUESTIONS_CHART_Y_AXIS_STUDENTS_VAR"/>
+		ANSWERED_QUESTIONS_CHART_Y_AXIS_STUDENTS : '<c:out value="${ANSWERED_QUESTIONS_CHART_Y_AXIS_STUDENTS_VAR}" />',
+		<fmt:message key="label.monitoring.summary.answered.questions.y.axis.groups" var="ANSWERED_QUESTIONS_CHART_Y_AXIS_GROUPS_VAR"/>
+		ANSWERED_QUESTIONS_CHART_Y_AXIS_GROUPS : '<c:out value="${ANSWERED_QUESTIONS_CHART_Y_AXIS_GROUPS_VAR}" />'
+	}),
+
+		activityCompletionChart = null,
 		answeredQuestionsChart = null,
 		COMPLETION_CHART_UPDATE_INTERVAL = 10 * 1000;