Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
===================================================================
diff -u -r21c27a799a8473c3a8844258ac269683831db33e -r3437878235018c207f602ea0464c109dd8e077c9
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java	(.../LearningController.java)	(revision 21c27a799a8473c3a8844258ac269683831db33e)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java	(.../LearningController.java)	(revision 3437878235018c207f602ea0464c109dd8e077c9)
@@ -51,6 +51,8 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.lesson.Lesson;
+import org.lamsfoundation.lams.lesson.service.ILessonService;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.qb.model.QbOption;
 import org.lamsfoundation.lams.qb.model.QbQuestion;
@@ -59,6 +61,7 @@
 import org.lamsfoundation.lams.rating.model.RatingCriteria;
 import org.lamsfoundation.lams.rating.model.ToolActivityRatingCriteria;
 import org.lamsfoundation.lams.rating.service.IRatingService;
+import org.lamsfoundation.lams.security.ISecurityService;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.tool.assessment.AssessmentConstants;
 import org.lamsfoundation.lams.tool.assessment.dto.OptionDTO;
@@ -121,6 +124,12 @@
     @Autowired
     private IUserManagementService userManagementService;
 
+    @Autowired
+    private ILessonService lessonService;
+
+    @Autowired
+    private ISecurityService securityService;
+
     /**
      * Read assessment data from database and put them into HttpSession. It will redirect to init.do directly after this
      * method run successfully.
@@ -151,7 +160,7 @@
 	    user = getSpecifiedUser(service, toolSessionId,
 		    WebUtil.readIntParam(request, AttributeNames.PARAM_USER_ID, false));
 	} else {
-	    user = getCurrentUser(toolSessionId);
+	    user = getCurrentAssessmentUser(toolSessionId);
 	}
 
 	Assessment assessment = service.getAssessmentBySessionId(toolSessionId);
@@ -1094,111 +1103,180 @@
 
 	    // if answers are going to be disclosed, prepare data for the table in results page
 	    if (assessment.isAllowDiscloseAnswers()) {
-		// such entities should not go into session map, but as request attributes instead
-		SortedSet<AssessmentSession> sessions = new TreeSet<>(new AssessmentSessionComparator());
-		sessions.addAll(service.getSessionsByContentId(assessment.getContentId()));
+		populateDisclosedAnswers(request, assessment, user);
+	    }
+	}
 
-		Long userSessionId = user.getSession().getSessionId();
-		Integer userSessionIndex = null;
-		int sessionIndex = 0;
-		// find user session in order to put it first
-		List<AssessmentSession> sessionList = new ArrayList<>();
-		for (AssessmentSession session : sessions) {
-		    if (userSessionId.equals(session.getSessionId())) {
-			userSessionIndex = sessionIndex;
-		    } else {
-			sessionList.add(session);
-		    }
-		    sessionIndex++;
-		}
-		// put user's own group first
-		sessionList.add(0, user.getSession());
-		request.setAttribute("sessions", sessionList);
+	//calculate whether isResubmitAllowed
+	int attemptsAllowed = assessment.getAttemptsAllowed();
+	boolean isResubmitAllowed = ((attemptsAllowed > dbResultCount) | (attemptsAllowed == 0));
+	sessionMap.put(AssessmentConstants.ATTR_IS_RESUBMIT_ALLOWED, isResubmitAllowed);
+    }
 
-		Map<Long, QuestionSummary> questionSummaries = service.getQuestionSummaryForExport(assessment);
-		request.setAttribute("questionSummaries", questionSummaries);
+    private void populateDisclosedAnswers(HttpServletRequest request, Assessment assessment, AssessmentUser user) {
+	// such entities should not go into session map, but as request attributes instead
+	SortedSet<AssessmentSession> sessions = new TreeSet<>(new AssessmentSessionComparator());
+	sessions.addAll(service.getSessionsByContentId(assessment.getContentId()));
 
-		// Assessment currently supports only one place for ratings.
-		// It is rating other groups' answers on results page.
-		// Criterion gets automatically created and there must be only one.
-		List<RatingCriteria> criteria = ratingService.getCriteriasByToolContentId(assessment.getContentId());
-		if (criteria.size() >= 2) {
-		    throw new IllegalArgumentException("There can be only one criterion for an Assessment activity. "
-			    + "If other criteria are introduced, the criterion for rating other groups' answers needs to become uniquely identifiable.");
-		}
-		ToolActivityRatingCriteria criterion = null;
-		if (criteria.isEmpty()) {
-		    criterion = (ToolActivityRatingCriteria) RatingCriteria
-			    .getRatingCriteriaInstance(RatingCriteria.TOOL_ACTIVITY_CRITERIA_TYPE);
-		    criterion.setTitle(service.getMessage("label.answer.rating.title"));
-		    criterion.setOrderId(1);
-		    criterion.setCommentsEnabled(true);
-		    criterion.setRatingStyle(RatingCriteria.RATING_STYLE_STAR);
-		    criterion.setToolContentId(assessment.getContentId());
+	Long userSessionId = user == null ? null : user.getSession().getSessionId();
+	Integer userSessionIndex = null;
+	int sessionIndex = 0;
+	// find user session in order to put it first
+	List<AssessmentSession> sessionList = new ArrayList<>();
+	for (AssessmentSession session : sessions) {
+	    if (userSessionId != null && userSessionId.equals(session.getSessionId())) {
+		userSessionIndex = sessionIndex;
+	    } else {
+		sessionList.add(session);
+	    }
+	    sessionIndex++;
+	}
+	// put user's own group first
+	if (user != null) {
+	    sessionList.add(0, user.getSession());
+	}
+	request.setAttribute("sessions", sessionList);
 
-		    userManagementService.save(criterion);
-		} else {
-		    criterion = (ToolActivityRatingCriteria) criteria.get(0);
-		}
+	Map<Long, QuestionSummary> questionSummaries = service.getQuestionSummaryForExport(assessment);
+	request.setAttribute("questionSummaries", questionSummaries);
 
-		// Item IDs are AssessmentQuestionResults UIDs, i.e. a user answer for a particular question
-		// Get all item IDs no matter which session they belong to.
-		Set<Long> itemIds = questionSummaries.values().stream()
-			.flatMap(s -> s.getQuestionResultsPerSession().stream())
-			.collect(Collectors.mapping(l -> l.get(l.size() - 1).getUid(), Collectors.toSet()));
+	// Assessment currently supports only one place for ratings.
+	// It is rating other groups' answers on results page.
+	// Criterion gets automatically created and there must be only one.
+	List<RatingCriteria> criteria = ratingService.getCriteriasByToolContentId(assessment.getContentId());
+	if (criteria.size() >= 2) {
+	    throw new IllegalArgumentException("There can be only one criterion for an Assessment activity. "
+		    + "If other criteria are introduced, the criterion for rating other groups' answers needs to become uniquely identifiable.");
+	}
+	ToolActivityRatingCriteria criterion = null;
+	if (criteria.isEmpty()) {
+	    criterion = (ToolActivityRatingCriteria) RatingCriteria
+		    .getRatingCriteriaInstance(RatingCriteria.TOOL_ACTIVITY_CRITERIA_TYPE);
+	    criterion.setTitle(service.getMessage("label.answer.rating.title"));
+	    criterion.setOrderId(1);
+	    criterion.setCommentsEnabled(true);
+	    criterion.setRatingStyle(RatingCriteria.RATING_STYLE_STAR);
+	    criterion.setToolContentId(assessment.getContentId());
 
-		List<ItemRatingDTO> itemRatingDtos = ratingService.getRatingCriteriaDtos(assessment.getContentId(),
-			null, itemIds, true, userId);
-		// Mapping of Item ID -> DTO
-		Map<Long, ItemRatingDTO> itemRatingDtoMap = itemRatingDtos.stream()
-			.collect(Collectors.toMap(ItemRatingDTO::getItemId, Function.identity()));
+	    userManagementService.save(criterion);
+	} else {
+	    criterion = (ToolActivityRatingCriteria) criteria.get(0);
+	}
 
-		Long ratingUserId = user.getSession().getGroupLeader() == null ? userId
-			: user.getSession().getGroupLeader().getUserId();
+	// Item IDs are AssessmentQuestionResults UIDs, i.e. a user answer for a particular question
+	// Get all item IDs no matter which session they belong to.
+	Set<Long> itemIds = questionSummaries.values().stream().flatMap(s -> s.getQuestionResultsPerSession().stream())
+		.collect(Collectors.mapping(l -> l.get(l.size() - 1).getUid(), Collectors.toSet()));
 
-		for (QuestionSummary summary : questionSummaries.values()) {
+	List<ItemRatingDTO> itemRatingDtos = ratingService.getRatingCriteriaDtos(assessment.getContentId(), null,
+		itemIds, true, user == null ? null : user.getUserId());
+	// Mapping of Item ID -> DTO
+	Map<Long, ItemRatingDTO> itemRatingDtoMap = itemRatingDtos.stream()
+		.collect(Collectors.toMap(ItemRatingDTO::getItemId, Function.identity()));
 
-		    List<List<AssessmentQuestionResult>> questionResultsPerSession = summary
-			    .getQuestionResultsPerSession();
-		    if (questionResultsPerSession != null) {
-			List<AssessmentQuestionResult> questionResults = questionResultsPerSession
-				.remove((int) userSessionIndex);
-			// user or his leader should rate all other groups' answers in order to show ratings left for own group
-			int expectedRatedItemCount = questionResultsPerSession.size();
+	Long ratingUserId = null;
+	if (user != null) {
+	    ratingUserId = user.getSession().getGroupLeader() == null ? user.getUserId()
+		    : user.getSession().getGroupLeader().getUserId();
+	}
 
-			Set<Long> questionItemIds = questionResultsPerSession.stream()
-				.collect(Collectors.mapping(l -> l.get(l.size() - 1).getUid(), Collectors.toSet()));
+	for (QuestionSummary summary : questionSummaries.values()) {
 
-			// question results need to be in the same order as sessions, i.e. user group first
-			questionResultsPerSession.add(0, questionResults);
+	    List<List<AssessmentQuestionResult>> questionResultsPerSession = summary.getQuestionResultsPerSession();
+	    if (questionResultsPerSession != null) {
+		List<AssessmentQuestionResult> questionResults = userSessionIndex == null ? null
+			: questionResultsPerSession.remove((int) userSessionIndex);
+		// user or his leader should rate all other groups' answers in order to show ratings left for own group
+		int expectedRatedItemCount = questionResultsPerSession.size();
 
-			// count how many ratings user or his leader left
-			// maybe exact session ID matching should be used here to make sure
-			int ratedItemCount = 0;
-			for (Long questionItemId : questionItemIds) {
-			    ItemRatingDTO itemRatingDTO = itemRatingDtoMap.get(questionItemId);
-			    for (RatingCommentDTO ratingCommentDTO : itemRatingDTO.getCommentDtos()) {
-				if (ratingCommentDTO.getUserId().equals(ratingUserId)) {
-				    ratedItemCount++;
-				}
-			    }
-			}
+		Set<Long> questionItemIds = questionResultsPerSession.stream()
+			.collect(Collectors.mapping(l -> l.get(l.size() - 1).getUid(), Collectors.toSet()));
 
-			summary.setShowOwnGroupRating(ratedItemCount == expectedRatedItemCount);
+		if (questionResults != null) {
+		    // question results need to be in the same order as sessions, i.e. user group first
+		    questionResultsPerSession.add(0, questionResults);
+		}
+		
+		// count how many ratings user or his leader left
+		// maybe exact session ID matching should be used here to make sure
+		int ratedItemCount = 0;
+		for (Long questionItemId : questionItemIds) {
+		    ItemRatingDTO itemRatingDTO = itemRatingDtoMap.get(questionItemId);
+		    for (RatingCommentDTO ratingCommentDTO : itemRatingDTO.getCommentDtos()) {
+			if (ratingCommentDTO.getUserId().equals(ratingUserId)) {
+			    ratedItemCount++;
+			}
 		    }
 		}
 
-		request.setAttribute("itemRatingDtos", itemRatingDtoMap);
+		summary.setShowOwnGroupRating(ratedItemCount == expectedRatedItemCount);
 	    }
 	}
 
-	//calculate whether isResubmitAllowed
-	int attemptsAllowed = assessment.getAttemptsAllowed();
-	boolean isResubmitAllowed = ((attemptsAllowed > dbResultCount) | (attemptsAllowed == 0));
-	sessionMap.put(AssessmentConstants.ATTR_IS_RESUBMIT_ALLOWED, isResubmitAllowed);
+	request.setAttribute("itemRatingDtos", itemRatingDtoMap);
     }
 
     /**
+     * A view to show other groups' answers and correct answers without specyfing a learner
+     */
+    @RequestMapping("/showResultsForTeacher")
+    public String showResultsForTeacher(HttpServletRequest request) {
+	long toolContentId = WebUtil.readLongParam(request, AssessmentConstants.PARAM_TOOL_CONTENT_ID);
+	UserDTO user = LearningController.getCurrentUser();
+	Lesson lesson = lessonService.getLessonByToolContentId(toolContentId);
+
+	securityService.isLessonMonitor(lesson.getLessonId(), user.getUserID(), "show Assessment results for teacher",
+		true);
+
+	// initialize Session Map
+	SessionMap<String, Object> sessionMap = new SessionMap<>();
+	request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
+
+	Assessment assessment = service.getAssessmentByContentId(toolContentId);
+
+	Set<QuestionReference> questionReferences = new TreeSet<>(new SequencableComparator());
+	questionReferences.addAll(assessment.getQuestionReferences());
+	HashMap<Long, AssessmentQuestion> questionToReferenceMap = new HashMap<>();
+
+	//add non-random questions
+	for (QuestionReference questionReference : questionReferences) {
+	    if (!questionReference.isRandomQuestion()) {
+		AssessmentQuestion question = questionReference.getQuestion();
+		questionToReferenceMap.put(questionReference.getUid(), question);
+	    }
+	}
+
+	LinkedList<QuestionDTO> questionDtos = new LinkedList<>();
+	for (QuestionReference questionReference : questionReferences) {
+	    AssessmentQuestion question = questionToReferenceMap.get(questionReference.getUid());
+
+	    QuestionDTO questionDto = question.getQuestionDTO();
+	    questionDto.setMaxMark(questionReference.getMaxMark());
+	    questionDtos.add(questionDto);
+	}
+
+	// paging - always all questions on a single page for teachers
+	List<Set<QuestionDTO>> pagedQuestionDtos = new ArrayList<>();
+	LinkedHashSet<QuestionDTO> questionsForOnePage = new LinkedHashSet<>(questionDtos);
+	pagedQuestionDtos.add(questionsForOnePage);
+
+	populateDisclosedAnswers(request, assessment, null);
+
+	request.setAttribute(AssessmentConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
+	request.setAttribute(AttributeNames.ATTR_MODE, ToolAccessMode.TEACHER);
+	sessionMap.put(AssessmentConstants.ATTR_TITLE, assessment.getTitle());
+	sessionMap.put(AssessmentConstants.ATTR_INSTRUCTIONS, assessment.getInstructions());
+	sessionMap.put(AssessmentConstants.ATTR_PAGED_QUESTION_DTOS, pagedQuestionDtos);
+	sessionMap.put(AssessmentConstants.ATTR_QUESTION_NUMBERING_OFFSET, 1);
+	sessionMap.put(AssessmentConstants.ATTR_PAGE_NUMBER, 1);
+	sessionMap.put(AssessmentConstants.ATTR_ASSESSMENT, assessment);
+	sessionMap.put(AssessmentConstants.CONFIG_KEY_HIDE_TITLES,
+		Boolean.valueOf(service.getConfigValue(AssessmentConstants.CONFIG_KEY_HIDE_TITLES)));
+
+	return "pages/learning/results";
+    }
+
+    /**
      * Store user answers in DB in last unfinished attempt and notify teachers about it.
      */
     @SuppressWarnings("unchecked")
@@ -1217,21 +1295,18 @@
 	// notify teachers
 	if ((mode != null) && !mode.isTeacher() && !isAutosave && isResultsStored
 		&& assessment.isNotifyTeachersOnAttemptCompletion()) {
-	    AssessmentUser assessmentUser = getCurrentUser(toolSessionId);
+	    AssessmentUser assessmentUser = getCurrentAssessmentUser(toolSessionId);
 	    String fullName = assessmentUser.getLastName() + " " + assessmentUser.getFirstName();
 	    service.notifyTeachersOnAttemptCompletion(toolSessionId, fullName);
 	}
 
 	return isResultsStored;
     }
 
-    private AssessmentUser getCurrentUser(Long sessionId) {
-	// try to get form system session
-	HttpSession ss = SessionManager.getSession();
-	// get back login user DTO
-	UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
-	AssessmentUser assessmentUser = service.getUserByIDAndSession(user.getUserID().longValue(), sessionId);
+    private AssessmentUser getCurrentAssessmentUser(Long sessionId) {
+	UserDTO user = LearningController.getCurrentUser();
 
+	AssessmentUser assessmentUser = service.getUserByIDAndSession(user.getUserID().longValue(), sessionId);
 	if (assessmentUser == null) {
 	    AssessmentSession session = service.getSessionBySessionId(sessionId);
 	    assessmentUser = new AssessmentUser(user, session);
@@ -1240,6 +1315,13 @@
 	return assessmentUser;
     }
 
+    private static UserDTO getCurrentUser() {
+	// try to get form system session
+	HttpSession ss = SessionManager.getSession();
+	// get back login user DTO
+	return (UserDTO) ss.getAttribute(AttributeNames.USER);
+    }
+
     private AssessmentUser getSpecifiedUser(IAssessmentService service, Long sessionId, Integer userId) {
 	AssessmentUser assessmentUser = service.getUserByIDAndSession(userId.longValue(), sessionId);
 	if (assessmentUser == null) {
Index: lams_tool_assessment/web/pages/learning/results.jsp
===================================================================
diff -u -r94e96499672682a3f2abcde0f4127648a71e1c2c -r3437878235018c207f602ea0464c109dd8e077c9
--- lams_tool_assessment/web/pages/learning/results.jsp	(.../results.jsp)	(revision 94e96499672682a3f2abcde0f4127648a71e1c2c)
+++ lams_tool_assessment/web/pages/learning/results.jsp	(.../results.jsp)	(revision 3437878235018c207f602ea0464c109dd8e077c9)
@@ -45,20 +45,23 @@
 		
 	<script type="text/javascript">
 		//var for jquery.jRating.js
-		var pathToImageFolder = "${lams}images/css/";
+		var pathToImageFolder = "${lams}images/css/",
 		
 		//vars for rating.js
-		var 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>',
-		COMMENTS_MIN_WORDS_LIMIT = 0,
-		MAX_RATES = 0,
-		MIN_RATES = 0,
-		LAMS_URL = '${lams}',
-		COUNT_RATED_ITEMS = true,
-		COMMENT_TEXTAREA_TIP_LABEL = '<fmt:message key="label.comment.textarea.tip"/>',
-		WARN_COMMENTS_IS_BLANK_LABEL = '<fmt:message key="error.resource.image.comment.blank"/>',
-		ALLOW_RERATE = false,
-		SESSION_ID = ${toolSessionID};
+			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>',
+			COMMENTS_MIN_WORDS_LIMIT = 0,
+			MAX_RATES = 0,
+			MIN_RATES = 0,
+			LAMS_URL = '${lams}',
+			COUNT_RATED_ITEMS = true,
+			COMMENT_TEXTAREA_TIP_LABEL = '<fmt:message key="label.comment.textarea.tip"/>',
+			WARN_COMMENTS_IS_BLANK_LABEL = '<fmt:message key="error.resource.image.comment.blank"/>',
+			ALLOW_RERATE = false;
+		<c:if test="${not empty toolSessionID}">
+			var SESSION_ID = ${toolSessionID};
+		</c:if>
+
 	</script>
 	<script type="text/javascript" src="${lams}includes/javascript/rating.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.jRating.js"></script>
@@ -135,14 +138,16 @@
 			</lams:Alert>
 		</c:if>
 		
-		<c:if test="${isLeadershipEnabled}">
+		<c:if test="${isLeadershipEnabled and not empty sessionMap.groupLeader}">
 			<lams:LeaderDisplay username="${sessionMap.groupLeader.firstName} ${sessionMap.groupLeader.lastName}" userId="${sessionMap.groupLeader.userId}"/>
 		</c:if>
 		
 		<lams:errors/>
 		<br>
 		
-		<%@ include file="results/attemptsummary.jsp"%>
+		<c:if test="${not empty result}">
+			<%@ include file="results/attemptsummary.jsp"%>
+		</c:if>
 		
 		<c:if test="${assessment.displaySummary}">
 			<div class="panel">
Index: lams_tool_assessment/web/pages/learning/results/essay.jsp
===================================================================
diff -u -r9007e50ca508c5ec3312cd880e6df2d1ec3dab1e -r3437878235018c207f602ea0464c109dd8e077c9
--- lams_tool_assessment/web/pages/learning/results/essay.jsp	(.../essay.jsp)	(revision 9007e50ca508c5ec3312cd880e6df2d1ec3dab1e)
+++ lams_tool_assessment/web/pages/learning/results/essay.jsp	(.../essay.jsp)	(revision 3437878235018c207f602ea0464c109dd8e077c9)
@@ -1,19 +1,21 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<div class="question-type">
-	<fmt:message key="label.learning.short.answer.answer" />
-</div>
+<c:if test="${not empty toolSessionID}">
+	<div class="question-type">
+		<fmt:message key="label.learning.short.answer.answer" />
+	</div>
+	
+	<div class="table-responsive">
+		<table class="table table-hover table-condensed">
+			<tr>
+				<td>
+					${question.answer}
+				</td>
+			</tr>
+		</table>
+	</div>
+</c:if>
 
-<div class="table-responsive">
-	<table class="table table-hover table-condensed">
-		<tr>
-			<td>
-				${question.answer}
-			</td>
-		</tr>
-	</table>
-</div>
-
 <c:if test="${assessment.allowDiscloseAnswers && fn:length(sessions) > 1}">
 	<table class="table table-responsive table-striped table-bordered table-hover table-condensed" id="rating-table-${question.uid}">
 		<tr role="row">
Index: lams_tool_assessment/web/pages/learning/results/markhedging.jsp
===================================================================
diff -u -r2b3d3b2f61d37cf2fa7cccc0cf4565e5dfc4b88e -r3437878235018c207f602ea0464c109dd8e077c9
--- lams_tool_assessment/web/pages/learning/results/markhedging.jsp	(.../markhedging.jsp)	(revision 2b3d3b2f61d37cf2fa7cccc0cf4565e5dfc4b88e)
+++ lams_tool_assessment/web/pages/learning/results/markhedging.jsp	(.../markhedging.jsp)	(revision 3437878235018c207f602ea0464c109dd8e077c9)
@@ -26,17 +26,18 @@
 				</td>
 				
 				<td style="width: 100px;">
-				
-					<select name="question${questionIndex}_${option.displayOrder}" class="mark-hedging-select" data-question-index="${questionIndex}"
-							disabled="disabled">
-						
-						<c:forEach var="i" begin="0" end="${question.maxMark}">
-							<option
-								<c:if test="${option.answerInt == i}">selected="selected"</c:if>						
-							>${i}</option>
-						</c:forEach>
-						
-					</select>
+					<c:if test="${not empty toolSessionID}">
+						<select name="question${questionIndex}_${option.displayOrder}" class="mark-hedging-select" data-question-index="${questionIndex}"
+								disabled="disabled">
+							
+							<c:forEach var="i" begin="0" end="${question.maxMark}">
+								<option
+									<c:if test="${option.answerInt == i}">selected="selected"</c:if>						
+								>${i}</option>
+							</c:forEach>
+							
+						</select>
+					</c:if>
 				</td>
 				
 				<c:if test="${assessment.allowQuestionFeedback}">
@@ -51,7 +52,7 @@
 		</c:forEach>
 	</table>
 		
-	<c:if test="${question.hedgingJustificationEnabled}">
+	<c:if test="${not empty toolSessionID and question.hedgingJustificationEnabled}">
 		<lams:textarea id="justification-question${questionIndex}" name="question${questionIndex}" class="mark-hedging-select margin-top-minus-10"
 						disabled="disabled" rows="4" cols="60">
 			<c:out value="${question.answer}" />
@@ -81,15 +82,17 @@
 		<c:out value="${question.feedback}" escapeXml="false" />
 	</div>
 </c:if>
-	
-<div class="question-feedback" style="padding-bottom: 10px;">
-	<fmt:message key="label.learning.marks" >
-		<fmt:param><fmt:formatNumber value="${question.mark}" maxFractionDigits="3"/></fmt:param>
-		<fmt:param>${question.maxMark}</fmt:param>
-	</fmt:message>
-	<c:if test="${(question.mark != question.maxMark) && (fn:length(question.questionResults) > 1)}">
-		<fmt:message key="label.learning.penalty" >
-			<fmt:param><fmt:formatNumber value="${question.penalty}" maxFractionDigits="2"/></fmt:param>
+
+<c:if test="${not empty toolSessionID}">
+	<div class="question-feedback" style="padding-bottom: 10px;">
+		<fmt:message key="label.learning.marks" >
+			<fmt:param><fmt:formatNumber value="${question.mark}" maxFractionDigits="3"/></fmt:param>
+			<fmt:param>${question.maxMark}</fmt:param>
 		</fmt:message>
-	</c:if>
-</div>
+		<c:if test="${(question.mark != question.maxMark) && (fn:length(question.questionResults) > 1)}">
+			<fmt:message key="label.learning.penalty" >
+				<fmt:param><fmt:formatNumber value="${question.penalty}" maxFractionDigits="2"/></fmt:param>
+			</fmt:message>
+		</c:if>
+	</div>
+</c:if>
\ No newline at end of file
Index: lams_tool_assessment/web/pages/learning/results/matchingpairs.jsp
===================================================================
diff -u -r9c3a64b840753192b333afb73c8fe7bdb54be638 -r3437878235018c207f602ea0464c109dd8e077c9
--- lams_tool_assessment/web/pages/learning/results/matchingpairs.jsp	(.../matchingpairs.jsp)	(revision 9c3a64b840753192b333afb73c8fe7bdb54be638)
+++ lams_tool_assessment/web/pages/learning/results/matchingpairs.jsp	(.../matchingpairs.jsp)	(revision 3437878235018c207f602ea0464c109dd8e077c9)
@@ -1,8 +1,10 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<div class="question-type">
-	<fmt:message key="label.learning.matching.pairs.pick.up" />
-</div>
+<c:if test="${not empty toolSessionID}">
+	<div class="question-type">
+		<fmt:message key="label.learning.matching.pairs.pick.up" />
+	</div>
+</c:if>
 
 <div class="table-responsive">
 	<table class="table table-hover table-condensed">
Index: lams_tool_assessment/web/pages/learning/results/multiplechoice.jsp
===================================================================
diff -u -r9c3a64b840753192b333afb73c8fe7bdb54be638 -r3437878235018c207f602ea0464c109dd8e077c9
--- lams_tool_assessment/web/pages/learning/results/multiplechoice.jsp	(.../multiplechoice.jsp)	(revision 9c3a64b840753192b333afb73c8fe7bdb54be638)
+++ lams_tool_assessment/web/pages/learning/results/multiplechoice.jsp	(.../multiplechoice.jsp)	(revision 3437878235018c207f602ea0464c109dd8e077c9)
@@ -1,15 +1,17 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<div class="question-type">
-	<c:choose>
-		<c:when test="${question.multipleAnswersAllowed}">
-			<fmt:message key="label.learning.choose.at.least.one.answer" />
-		</c:when>
-		<c:otherwise>
-			<fmt:message key="label.learning.choose.one.answer" />
-		</c:otherwise>
-	</c:choose>
-</div>
+<c:if test="${not empty toolSessionID}">
+	<div class="question-type">
+		<c:choose>
+			<c:when test="${question.multipleAnswersAllowed}">
+				<fmt:message key="label.learning.choose.at.least.one.answer" />
+			</c:when>
+			<c:otherwise>
+				<fmt:message key="label.learning.choose.one.answer" />
+			</c:otherwise>
+		</c:choose>
+	</div>
+</c:if>
 
 <div class="table-responsive">
 	<table class="table table-hover table-condensed">
@@ -32,20 +34,23 @@
 				    </c:if>			
                 </td>
 				<td class="${question.prefixAnswersWithLetters?'has-radio-button-prefix':'has-radio-button'}">
-					<c:choose>
-						<c:when test="${question.multipleAnswersAllowed}">
-							<input type="checkbox" name="question${status.index}_${option.displayOrder}" value="${true}"
-		 						<c:if test="${option.answerBoolean}">checked="checked"</c:if>
-								disabled="disabled"
-							/>
-						</c:when>
-						<c:otherwise>
-							<input type="radio" name="question${status.index}" value="${option.displayOrder}"
-		 						<c:if test="${option.answerBoolean}">checked="checked"</c:if>
-		 						disabled="disabled"
-							/>
-						</c:otherwise>
-					</c:choose>
+					<c:if test="${not empty toolSessionID}">
+						<c:choose>
+							<c:when test="${question.multipleAnswersAllowed}">
+								<input type="checkbox" name="question${status.index}_${option.displayOrder}" value="${true}"
+			 						<c:if test="${option.answerBoolean}">checked="checked"</c:if>
+									disabled="disabled"
+								/>
+							</c:when>
+							<c:otherwise>
+								<input type="radio" name="question${status.index}" value="${option.displayOrder}"
+			 						<c:if test="${option.answerBoolean}">checked="checked"</c:if>
+			 						disabled="disabled"
+								/>
+							</c:otherwise>
+						</c:choose>
+					</c:if>
+					
 					<c:if test="${question.prefixAnswersWithLetters}">
 			 			&nbsp;${option.formatPrefixLetter(answerStatus.index)}
  	                </c:if>	
Index: lams_tool_assessment/web/pages/learning/results/numerical.jsp
===================================================================
diff -u -r2b3d3b2f61d37cf2fa7cccc0cf4565e5dfc4b88e -r3437878235018c207f602ea0464c109dd8e077c9
--- lams_tool_assessment/web/pages/learning/results/numerical.jsp	(.../numerical.jsp)	(revision 2b3d3b2f61d37cf2fa7cccc0cf4565e5dfc4b88e)
+++ lams_tool_assessment/web/pages/learning/results/numerical.jsp	(.../numerical.jsp)	(revision 3437878235018c207f602ea0464c109dd8e077c9)
@@ -1,30 +1,32 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<div class="question-type">
-	<fmt:message key="label.learning.short.answer.answer" />
-</div>
+<c:if test="${not empty toolSessionID}">
+	<div class="question-type">
+		<fmt:message key="label.learning.short.answer.answer" />
+	</div>
+	
+	<div class="table-responsive">
+		<table class="table table-hover table-condensed">
+			<tr>
+				<td class="complete-item-gif">
+					<c:if test="${assessment.allowRightAnswersAfterQuestion && question.answerBoolean}">
+						<i class="fa fa-check text-success"></i>	
+					</c:if>			
+					<c:if test="${assessment.allowWrongAnswersAfterQuestion && !question.answerBoolean}">
+						<i class="fa fa-times text-danger"></i>	
+					</c:if>
+				</td>
+				
+				<td>
+					<input type="text" autocomplete="off" name="question${status.index}" value="<c:out value='${question.answer}' />" class="form-control"
+						disabled="disabled"
+					/>	
+				</td>
+			</tr>
+		</table>
+	</div>		
+</c:if>
 
-<div class="table-responsive">
-	<table class="table table-hover table-condensed">
-		<tr>
-			<td class="complete-item-gif">
-				<c:if test="${assessment.allowRightAnswersAfterQuestion && question.answerBoolean}">
-					<i class="fa fa-check text-success"></i>	
-				</c:if>			
-				<c:if test="${assessment.allowWrongAnswersAfterQuestion && !question.answerBoolean}">
-					<i class="fa fa-times text-danger"></i>	
-				</c:if>
-			</td>
-			
-			<td>
-				<input type="text" autocomplete="off" name="question${status.index}" value="<c:out value='${question.answer}' />" class="form-control"
-					disabled="disabled"
-				/>	
-			</td>
-		</tr>
-	</table>
-</div>		
-
 <c:if test="${assessment.allowQuestionFeedback && (question.questionFeedback != null)}">
 	<div class="feedback">
 		<c:out value="${question.questionFeedback}" escapeXml="false" />
Index: lams_tool_assessment/web/pages/learning/results/ordering.jsp
===================================================================
diff -u -r394f403c289f0fd7808c228840bead5c4e7d5d32 -r3437878235018c207f602ea0464c109dd8e077c9
--- lams_tool_assessment/web/pages/learning/results/ordering.jsp	(.../ordering.jsp)	(revision 394f403c289f0fd7808c228840bead5c4e7d5d32)
+++ lams_tool_assessment/web/pages/learning/results/ordering.jsp	(.../ordering.jsp)	(revision 3437878235018c207f602ea0464c109dd8e077c9)
@@ -1,9 +1,11 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<div class="question-type">
-	<fmt:message key="label.learning.ordering.sort.answers" />
-</div>
-	
+<c:if test="${not empty toolSessionID}">
+	<div class="question-type">
+		<fmt:message key="label.learning.ordering.sort.answers" />
+	</div>
+</c:if>
+
 <div class="table-responsive">
 	<table class="table table-hover table-condensed">
 		<c:forEach var="option" items="${question.optionDtos}" varStatus="ordStatus">
Index: lams_tool_assessment/web/pages/learning/results/truefalse.jsp
===================================================================
diff -u -r2b3d3b2f61d37cf2fa7cccc0cf4565e5dfc4b88e -r3437878235018c207f602ea0464c109dd8e077c9
--- lams_tool_assessment/web/pages/learning/results/truefalse.jsp	(.../truefalse.jsp)	(revision 2b3d3b2f61d37cf2fa7cccc0cf4565e5dfc4b88e)
+++ lams_tool_assessment/web/pages/learning/results/truefalse.jsp	(.../truefalse.jsp)	(revision 3437878235018c207f602ea0464c109dd8e077c9)
@@ -1,8 +1,10 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<div class="question-type">
-	<fmt:message key="label.learning.short.answer.answer" />
-</div>
+<c:if test="${not empty toolSessionID}">
+	<div class="question-type">
+		<fmt:message key="label.learning.short.answer.answer" />
+	</div>
+</c:if>
 
 <div class="table-responsive">
 	<table class="table table-hover table-condensed">
@@ -27,10 +29,12 @@
 			</td>
 					
 			<td class="has-radio-button">
-				<input type="radio" name="question${status.index}" value="${true}"
-	 				<c:if test="${question.answerBoolean}">checked="checked"</c:if>
-					disabled="disabled"				 
-				/>
+				<c:if test="${not empty toolSessionID}">
+					<input type="radio" name="question${status.index}" value="${true}"
+		 				<c:if test="${question.answerBoolean}">checked="checked"</c:if>
+						disabled="disabled"	
+					/>
+				</c:if>
 			</td>
 			<td>
 				<fmt:message key="label.learning.true.false.true" />
@@ -56,10 +60,12 @@
 			</td>
 						
 			<td class="has-radio-button">
-				<input type="radio" name="question${status.index}" value="${false}"
-	 				<c:if test="${(!question.answerBoolean) and (question.answer != null)}">checked="checked"</c:if>
-					disabled="disabled"
-				/>
+				<c:if test="${not empty toolSessionID}">
+					<input type="radio" name="question${status.index}" value="${false}"
+		 				<c:if test="${(!question.answerBoolean) and (question.answer != null)}">checked="checked"</c:if>
+						disabled="disabled"
+					/>
+				</c:if>
 			</td>
 			<td>
 				<fmt:message key="label.learning.true.false.false" />
Index: lams_tool_assessment/web/pages/learning/results/vsa.jsp
===================================================================
diff -u -re8a7110708b15579af2c6b31ac52a6da427fef6d -r3437878235018c207f602ea0464c109dd8e077c9
--- lams_tool_assessment/web/pages/learning/results/vsa.jsp	(.../vsa.jsp)	(revision e8a7110708b15579af2c6b31ac52a6da427fef6d)
+++ lams_tool_assessment/web/pages/learning/results/vsa.jsp	(.../vsa.jsp)	(revision 3437878235018c207f602ea0464c109dd8e077c9)
@@ -1,29 +1,32 @@
 <%@ include file="/common/taglibs.jsp"%>
 
-<div class="question-type">
-	<fmt:message key="label.learning.short.answer.answer" />
-</div>
+<c:if test="${not empty toolSessionID}">
+	<div class="question-type">
+		<fmt:message key="label.learning.short.answer.answer" />
+	</div>
+	
+	<div class="table-responsive">
+		<table class="table table-hover table-condensed">
+			<tr>
+				<td class="complete-item-gif">
+					<c:if test="${assessment.allowRightAnswersAfterQuestion && question.answerBoolean}">
+						<i class="fa fa-check text-success"></i>
+					</c:if>			
+					<c:if test="${assessment.allowWrongAnswersAfterQuestion && !question.answerBoolean}">
+						<i class="fa fa-times text-danger"></i>
+					</c:if>	
+				</td>
+				
+				<td>
+					<input type="text" autocomplete="off" name="question${status.index}" value="<c:out value='${question.answer}' />"  class="form-control" 
+						disabled="disabled"
+					/>	
+				</td>	
+			</tr>
+		</table>
+	</div>	
 
-<div class="table-responsive">
-	<table class="table table-hover table-condensed">
-		<tr>
-			<td class="complete-item-gif">
-				<c:if test="${assessment.allowRightAnswersAfterQuestion && question.answerBoolean}">
-					<i class="fa fa-check text-success"></i>
-				</c:if>			
-				<c:if test="${assessment.allowWrongAnswersAfterQuestion && !question.answerBoolean}">
-					<i class="fa fa-times text-danger"></i>
-				</c:if>	
-			</td>
-			
-			<td>
-				<input type="text" autocomplete="off" name="question${status.index}" value="<c:out value='${question.answer}' />"  class="form-control" 
-					disabled="disabled"
-				/>	
-			</td>	
-		</tr>
-	</table>
-</div>	
+</c:if>
 
 <c:if test="${assessment.allowQuestionFeedback && (question.questionFeedback != null)}">
 	<div class="feedback">