Index: lams_monitoring/web/tblmonitor/aes.jsp
===================================================================
diff -u -r2ce1ca7a4995e15743c5800fdd789868b0236836 -r8fec6246571ad1c7a6f6aae450f07b1f52bd19c4
--- lams_monitoring/web/tblmonitor/aes.jsp	(.../aes.jsp)	(revision 2ce1ca7a4995e15743c5800fdd789868b0236836)
+++ lams_monitoring/web/tblmonitor/aes.jsp	(.../aes.jsp)	(revision 8fec6246571ad1c7a6f6aae450f07b1f52bd19c4)
@@ -22,18 +22,27 @@
 		});
 	});
 	
-	function loadAePane(targetToolContentId){
+	function loadAePane(targetToolContentId, contentType){
 		$('#aes-tab .tab-pane').each(function(){
 			var aePane = $(this),
 				toolContentId = aePane.data('toolContentId'),
 				toolType = aePane.data('toolType'),
 				nav = $('#aes-tab .nav-tabs a[data-tool-content-id="' + toolContentId + '"]').closest('li');
 	
 			if (toolContentId == targetToolContentId) {
+				var url = null;
+				if (toolType == 'd') {
+					url =  "<lams:LAMSURL/>tool/ladoku11/monitoring/ae.do?toolContentID="  + toolContentId;
+				} else if (contentType == 'studentChoices' || (!contentType && aePane.data('contentType') == 'studentChoices')){
+					// contentType is an extra setting saying which content from the given tool type to display
+					url =  "<lams:LAMSURL/>tool/laasse10/tblmonitoring/aesStudentChoices.do?toolContentID="  + toolContentId;
+					aePane.data('contentType', 'studentChoices');
+				} else {
+					url = "<lams:LAMSURL/>tool/laasse10/tblmonitoring/assessment.do?toolContentID="  + toolContentId;
+					aePane.data('contentType', 'default');
+				}
 				// load AE tab content for the given tool content ID
-				aePane.load(toolType == "d" ? 
-						 "<lams:LAMSURL/>tool/ladoku11/monitoring/ae.do?toolContentID="  + toolContentId
-						: "<lams:LAMSURL/>tool/laasse10/tblmonitoring/assessment.do?toolContentID="  + toolContentId);
+				aePane.load(url);
 					
 				aePane.addClass('active');
 				nav.addClass('active');