Index: lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -rfeb6062a5128a445b1fa0095b8c9d6cf232af90f
--- lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.hbm.xml	(.../AssessmentQuestionResult.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_assessment/conf/hibernate/mappings/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.hbm.xml	(.../AssessmentQuestionResult.hbm.xml)	(revision feb6062a5128a445b1fa0095b8c9d6cf232af90f)
@@ -127,6 +127,14 @@
             insert="true"
             column="finish_date"
         />
+        
+        <property
+            name="confidenceLevel"
+            type="int"
+            update="true"
+            insert="true"
+            column="confidence_level"
+        />
 
         <!--
             To add non XDoclet property mappings, create a file named
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
===================================================================
diff -u -r373dcc4ea6d1a07c60268ceccd9d1e69d9c35f9c -rfeb6062a5128a445b1fa0095b8c9d6cf232af90f
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml	(.../assessmentApplicationContext.xml)	(revision 373dcc4ea6d1a07c60268ceccd9d1e69d9c35f9c)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml	(.../assessmentApplicationContext.xml)	(revision feb6062a5128a445b1fa0095b8c9d6cf232af90f)
@@ -89,9 +89,6 @@
    		<property name="auditService">
    			<ref bean="auditService"/>
    		</property>
-   		<property name="confidenceLevelService">
-   			<ref bean="confidenceLevelService"/>
-   		</property>
    		<property name="userManagementService">
    			<ref bean="userManagementService"/>
    		</property>
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentResultDAO.java
===================================================================
diff -u -ra78be3f1e9a9f6b7b69d12d63ca3a14f3c80b931 -rfeb6062a5128a445b1fa0095b8c9d6cf232af90f
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentResultDAO.java	(.../AssessmentResultDAO.java)	(revision a78be3f1e9a9f6b7b69d12d63ca3a14f3c80b931)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentResultDAO.java	(.../AssessmentResultDAO.java)	(revision feb6062a5128a445b1fa0095b8c9d6cf232af90f)
@@ -67,6 +67,16 @@
      * @return
      */
     List<AssessmentResult> getLastFinishedAssessmentResults(Long contentId);
+    
+    List<Object[]> getLastFinishedAssessmentResultsBySession(Long sessionId);
+    
+    /**
+     * Get results for all leaders in current activity.
+     * 
+     * @param contentId
+     * @return
+     */
+    List<Object[]> getLeadersLastFinishedAssessmentResults(Long contentId);
 
     int getAssessmentResultCount(Long assessmentUid, Long userId);
 
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentUserDAO.java
===================================================================
diff -u -r60d9a173d5590295376322fc3e857ae2dca37717 -rfeb6062a5128a445b1fa0095b8c9d6cf232af90f
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentUserDAO.java	(.../AssessmentUserDAO.java)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentUserDAO.java	(.../AssessmentUserDAO.java)	(revision feb6062a5128a445b1fa0095b8c9d6cf232af90f)
@@ -46,9 +46,10 @@
 	    String sortBy, String sortOrder, String searchString);
     
     List<Number> getRawUserMarksBySession(Long sessionId);
+    
     Object[] getStatsMarksBySession(Long sessionId);
+    
     List<Number> getRawLeaderMarksByToolContentId(Long toolContentId);
+    
     Object[] getStatsMarksForLeaders(Long toolContentId);
-
-
 }
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
===================================================================
diff -u -r14ed9cf65b0eb96782a182a99dcc179d5db74986 -rfeb6062a5128a445b1fa0095b8c9d6cf232af90f
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java	(.../AssessmentResultDAOHibernate.java)	(revision 14ed9cf65b0eb96782a182a99dcc179d5db74986)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java	(.../AssessmentResultDAOHibernate.java)	(revision feb6062a5128a445b1fa0095b8c9d6cf232af90f)
@@ -30,6 +30,7 @@
 import org.lamsfoundation.lams.tool.assessment.dao.AssessmentResultDAO;
 import org.lamsfoundation.lams.tool.assessment.dto.AssessmentUserDTO;
 import org.lamsfoundation.lams.tool.assessment.model.AssessmentResult;
+import org.lamsfoundation.lams.usermanagement.User;
 import org.springframework.stereotype.Repository;
 
 @Repository
@@ -218,6 +219,22 @@
     public List<AssessmentResult> getLastFinishedAssessmentResults(Long contentId) {
 	return (List<AssessmentResult>) doFind(FIND_LAST_FINISHED_RESULTS_BY_CONTENT_ID, new Object[] { contentId });
     }
+    
+    @Override
+    public List<Object[]> getLastFinishedAssessmentResultsBySession(Long sessionId) {
+	final String FIND_LAST_FINISHED_RESULTS_BY_SESSION_ID = "SELECT r, u FROM " + AssessmentResult.class.getName()
+		+ " AS r, " + User.class.getName() + " as u WHERE r.sessionId=? AND (r.finishDate != null) AND r.latest=1 AND u.userId=r.user.userId";
+	
+	return (List<Object[]>) doFind(FIND_LAST_FINISHED_RESULTS_BY_SESSION_ID, new Object[] { sessionId });
+    }
+    
+    @Override
+    public List<Object[]> getLeadersLastFinishedAssessmentResults(Long contentId) {
+	final String FIND_LAST_FINISHED_RESULTS_BY_SESSION_ID = "SELECT r, u FROM " + AssessmentResult.class.getName()
+		+ " AS r, " + User.class.getName() + " as u WHERE r.user=r.user.session.groupLeader AND r.assessment.contentId=? AND (r.finishDate != null) AND r.latest=1 AND u.userId=r.user.userId";
+	
+	return (List<Object[]>) doFind(FIND_LAST_FINISHED_RESULTS_BY_SESSION_ID, new Object[] { contentId });
+    }
 
     @Override
     public int getAssessmentResultCount(Long assessmentUid, Long userId) {
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
===================================================================
diff -u -r60d9a173d5590295376322fc3e857ae2dca37717 -rfeb6062a5128a445b1fa0095b8c9d6cf232af90f
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java	(.../AssessmentUserDAOHibernate.java)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java	(.../AssessmentUserDAOHibernate.java)	(revision feb6062a5128a445b1fa0095b8c9d6cf232af90f)
@@ -62,8 +62,6 @@
 	    + " JOIN tl_laasse10_assessment a ON s.assessment_uid = a.uid "
 	    + " WHERE r.finish_date IS NOT NULL AND r.latest = 1 AND a.content_id = :toolContentId";
 
-    
-
     @SuppressWarnings("rawtypes")
     @Override
     public AssessmentUser getUserByUserIDAndSessionID(Long userID, Long sessionId) {
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20171016.sql
===================================================================
diff -u -r373dcc4ea6d1a07c60268ceccd9d1e69d9c35f9c -rfeb6062a5128a445b1fa0095b8c9d6cf232af90f
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20171016.sql	(.../patch20171016.sql)	(revision 373dcc4ea6d1a07c60268ceccd9d1e69d9c35f9c)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20171016.sql	(.../patch20171016.sql)	(revision feb6062a5128a445b1fa0095b8c9d6cf232af90f)
@@ -10,6 +10,9 @@
 ALTER TABLE tl_laasse10_assessment_question ADD COLUMN question_hash CHAR(40);
 UPDATE tl_laasse10_assessment_question SET question_hash = SHA1(CONCAT(title, question));
 
+--add confidence level property to tl_laasse10_question_result
+ALTER TABLE tl_laasse10_question_result ADD COLUMN confidence_level int;
+
 UPDATE lams_tool SET tool_version='20171016' WHERE tool_signature='laasse10';
 
 ----------------------Put all sql statements above here-------------------------
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java
===================================================================
diff -u -r373dcc4ea6d1a07c60268ceccd9d1e69d9c35f9c -rfeb6062a5128a445b1fa0095b8c9d6cf232af90f
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java	(.../AssessmentQuestionResult.java)	(revision 373dcc4ea6d1a07c60268ceccd9d1e69d9c35f9c)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java	(.../AssessmentQuestionResult.java)	(revision feb6062a5128a445b1fa0095b8c9d6cf232af90f)
@@ -50,11 +50,11 @@
     private float penalty;
     private Set<AssessmentOptionAnswer> optionAnswers;
     private Date finishDate;
+    private int confidenceLevel;
 
     // DTO fields:
     private AssessmentUser user;
     private String answerStringEscaped;
-    private int confidenceLevel;
 
     public AssessmentQuestionResult() {
 	optionAnswers = new LinkedHashSet<AssessmentOptionAnswer>();
@@ -240,7 +240,15 @@
     public void setFinishDate(Date finishDate) {
 	this.finishDate = finishDate;
     }
+    
+    public int getConfidenceLevel() {
+	return confidenceLevel;
+    }
 
+    public void setConfidenceLevel(int confidenceLevel) {
+	this.confidenceLevel = confidenceLevel;
+    }
+
     public AssessmentUser getUser() {
 	return user;
     }
@@ -256,13 +264,5 @@
     public void setAnswerStringEscaped(String answerStringEscaped) {
 	this.answerStringEscaped = answerStringEscaped;
     }
-    
-    public int getConfidenceLevel() {
-	return confidenceLevel;
-    }
 
-    public void setConfidenceLevel(int confidenceLevel) {
-	this.confidenceLevel = confidenceLevel;
-    }
-
 }
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
===================================================================
diff -u -r373dcc4ea6d1a07c60268ceccd9d1e69d9c35f9c -rfeb6062a5128a445b1fa0095b8c9d6cf232af90f
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision 373dcc4ea6d1a07c60268ceccd9d1e69d9c35f9c)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision feb6062a5128a445b1fa0095b8c9d6cf232af90f)
@@ -51,8 +51,7 @@
 import org.apache.tomcat.util.json.JSONArray;
 import org.apache.tomcat.util.json.JSONException;
 import org.apache.tomcat.util.json.JSONObject;
-import org.lamsfoundation.lams.confidencelevel.ConfidenceLevel;
-import org.lamsfoundation.lams.confidencelevel.service.IConfidenceLevelService;
+import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
 import org.lamsfoundation.lams.events.IEventNotificationService;
 import org.lamsfoundation.lams.gradebook.service.IGradebookService;
 import org.lamsfoundation.lams.learning.service.ILearnerService;
@@ -113,7 +112,6 @@
 import org.lamsfoundation.lams.util.JsonUtil;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.NumberUtil;
-import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.util.audit.IAuditService;
 
 /**
@@ -143,8 +141,6 @@
     private AssessmentOutputFactory assessmentOutputFactory;
 
     // system services
-    
-    private IConfidenceLevelService confidenceLevelService;
 
     private ILamsToolService toolService;
 
@@ -268,6 +264,7 @@
 		    userQuestionResult.setMark(leaderQuestionResult.getMark());
 		    userQuestionResult.setMaxMark(leaderQuestionResult.getMaxMark());
 		    userQuestionResult.setPenalty(leaderQuestionResult.getPenalty());
+		    userQuestionResult.setConfidenceLevel(leaderQuestionResult.getConfidenceLevel());
 
 		    Set<AssessmentOptionAnswer> leaderOptionAnswers = leaderQuestionResult.getOptionAnswers();
 		    Set<AssessmentOptionAnswer> userOptionAnswers = userQuestionResult.getOptionAnswers();
@@ -288,18 +285,6 @@
 	}
 
 	assessmentResultDao.saveObject(userResult);
-	
-	// copy leader's confidence levels to the current user
-	Assessment assessment = leaderResult.getAssessment();
-	if (assessment.isEnableConfidenceLevels()) {
-	    List<ConfidenceLevel> confidences = confidenceLevelService.getConfidenceLevelsByUser(leader.getUserId().intValue(), toolSessionId);
-	    Map<Long, Integer> questionUidToConfidenceLevelMap = new HashMap<Long, Integer>();
-	    for (ConfidenceLevel confidence : confidences) {
-		questionUidToConfidenceLevelMap.put(confidence.getQuestionUid(), confidence.getConfidenceLevel());
-	    }
-	    
-	    confidenceLevelService.saveConfidenceLevels(toolSessionId, user.getUserId().intValue(), questionUidToConfidenceLevelMap);
-	}
     }
 
     @Override
@@ -572,7 +557,6 @@
 	}
 
 	// store all answers (in all pages)
-	Map<Long, Integer> questionUidToConfidenceLevelMap = new HashMap<Long, Integer>();
 	for (Set<QuestionDTO> questionsForOnePage : pagedQuestions) {
 	    for (QuestionDTO questionDto : questionsForOnePage) {
 
@@ -607,22 +591,13 @@
 			continue;
 		    }
 		}
-		
-		// store confidence levels entered by the learner
-		int level = questionDto.getConfidenceLevel();
-		questionUidToConfidenceLevelMap.put(questionDto.getUid(), level);
 
 		float userQeustionGrade = storeUserAnswer(result, questionDto, isAutosave);
 		grade += userQeustionGrade;
 
 		maximumGrade += questionDto.getGrade();
 	    }
 	}
-	
-	// store confidence levels entered by the learner
-	if (assessment.isEnableConfidenceLevels()) {
-	    confidenceLevelService.saveConfidenceLevels(result.getSessionId(), userId.intValue(), questionUidToConfidenceLevelMap);
-	}
 
 	// store grades and finished date only on user hitting submit all answers button (and not submit mark hedging
 	// question)
@@ -691,7 +666,13 @@
 		optionAnswer.setAnswerInt(j++);
 	    }
 	}
+	
+	// store confidence levels entered by the learner
+	if (assessment.isEnableConfidenceLevels()) {
+	    questionResult.setConfidenceLevel(questionDto.getConfidenceLevel());
+	}
 
+	//calculate both mark and maxMark
 	float mark = 0;
 	float maxMark = questionDto.getGrade();
 	if (questionDto.getType() == AssessmentConstants.QUESTION_TYPE_MULTIPLE_CHOICE) {
@@ -1100,22 +1081,6 @@
 		}
 	    }
 	    
-	    // populate user entered confidence levels
-	    if (assessment.isEnableConfidenceLevels()) {
-		List<ConfidenceLevel> confidenceLevels = getConfidenceLevelsByUser(userId.intValue(),
-			sessionId);
-
-		for (AssessmentQuestionResult questionResult : questionResultsToDisplay) {
-		    //find according confidenceLevel
-		    for (ConfidenceLevel confidenceLevel : confidenceLevels) {
-			if (questionResult.getAssessmentQuestion().getUid().equals(confidenceLevel.getQuestionUid())) {
-			    questionResult.setConfidenceLevel(confidenceLevel.getConfidenceLevel());
-			    break;
-			}
-		    }
-		}
-	    }
-	    
 	    resultDto.setQuestionResults(questionResultsToDisplay);
 
 	    //escaping
@@ -1159,10 +1124,6 @@
 		}
 	    }
 
-	    List<ConfidenceLevel> confidenceLevels = assessment.isEnableConfidenceLevels()
-		    ? getConfidenceLevelsByUser(userId.intValue(), sessionId)
-		    : null;
-
 	    //prepare list of UserSummaryItems
 	    ArrayList<UserSummaryItem> userSummaryItems = new ArrayList<UserSummaryItem>();
 	    for (AssessmentQuestion question : questions) {
@@ -1174,20 +1135,8 @@
 		    for (AssessmentQuestionResult questionResult : result.getQuestionResults()) {
 			if (question.getUid().equals(questionResult.getAssessmentQuestion().getUid())) {
 
-			    // for displaying purposes only (no saving occurrs)
+			    // for displaying purposes only (no saving occurs)
 			    questionResult.setFinishDate(result.getFinishDate());
-			    
-			    // prepare for displaying purposes confidence levels 
-			    if (assessment.isEnableConfidenceLevels()) {
-				//find according confidenceLevel
-				for (ConfidenceLevel confidenceLevel : confidenceLevels) {
-				    if (questionResult.getAssessmentQuestion().getUid()
-					    .equals(confidenceLevel.getQuestionUid())) {
-					questionResult.setConfidenceLevel(confidenceLevel.getConfidenceLevel());
-					break;
-				    }
-				}
-			    }
 
 			    questionResults.add(questionResult);
 			    break;
@@ -2351,18 +2300,8 @@
 	String message = messageService.getMessage("event.learner.completes.attempt.body", new Object[] { userName });
 	eventNotificationService.notifyLessonMonitors(sessionId, message, false);
     }
-
-    @Override
-    public List<ConfidenceLevel> getConfidenceLevelsByUser(Integer userId, Long toolSessionId) {
-	return confidenceLevelService.getConfidenceLevelsByUser(userId, toolSessionId);
-    }
     
     @Override
-    public List<ConfidenceLevel> getConfidenceLevelsByQuestionAndSession(Long questionUid, Long toolSessionId) {
-	return confidenceLevelService.getConfidenceLevelsByQuestionAndSession(questionUid, toolSessionId);
-    }
-    
-    @Override
     public List<Number> getMarksArray(Long sessionId) {
 	return assessmentUserDao.getRawUserMarksBySession(sessionId);
     }
@@ -2466,10 +2405,6 @@
     public void setAuditService(IAuditService auditService) {
 	this.auditService = auditService;
     }
-    
-    public void setConfidenceLevelService(IConfidenceLevelService confidenceLevelService) {
-	this.confidenceLevelService = confidenceLevelService;
-    }
 
     public void setLearnerService(ILearnerService learnerService) {
 	this.learnerService = learnerService;
@@ -2725,38 +2660,95 @@
 	assessmentSessionDao.deleteBySessionId(toolSessionId);
     }
 
-    /**
-     * Get the tool output for the given tool output names.
-     *
-     * @see org.lamsfoundation.lams.tool.ToolSessionManager#getToolOutput(java.util.List<String>, java.lang.Long,
-     *      java.lang.Long)
-     */
     @Override
     public SortedMap<String, ToolOutput> getToolOutput(List<String> names, Long toolSessionId, Long learnerId) {
 	return assessmentOutputFactory.getToolOutput(names, this, toolSessionId, learnerId);
     }
 
-    /**
-     * Get the tool output for the given tool output name.
-     *
-     * @see org.lamsfoundation.lams.tool.ToolSessionManager#getToolOutput(java.lang.String, java.lang.Long,
-     *      java.lang.Long)
-     */
     @Override
     public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) {
 	return assessmentOutputFactory.getToolOutput(name, this, toolSessionId, learnerId);
     }
 
-    /**
-     * Get the tool output for the given tool output name.
-     *
-     * @see org.lamsfoundation.lams.tool.ToolSessionManager#getToolOutput(java.lang.String, java.lang.Long)
-     */
     @Override
     public List<ToolOutput> getToolOutputs(String name, Long toolContentId) {
 	return assessmentOutputFactory.getToolOutputs(name, this, toolContentId);
     }
+    
+    @Override
+    public List<ConfidenceLevelDTO> getConfidenceLevels(Long toolSessionId) {
+	List<ConfidenceLevelDTO> confidenceLevelDtos = new ArrayList<ConfidenceLevelDTO>();
+	if (toolSessionId == null) {
+	    return confidenceLevelDtos;
+	}
+	
+	Assessment assessment = getAssessmentBySessionId(toolSessionId);
+	//in case Assessment is leader aware return all leaders confidences, otherwise - confidences from the users from the same group as requestor  
+	List<Object[]> assessmentResultsAndUsers = assessment.isUseSelectLeaderToolOuput()
+		? assessmentResultDao.getLeadersLastFinishedAssessmentResults(assessment.getContentId())
+		: assessmentResultDao.getLastFinishedAssessmentResultsBySession(toolSessionId);
 
+	for (Object[] assessmentResultsAndUsersIter : assessmentResultsAndUsers) {
+	    AssessmentResult assessmentResult = (AssessmentResult) assessmentResultsAndUsersIter[0];
+	    User user = (User) assessmentResultsAndUsersIter[1];
+	    Integer userId = user.getUserId();
+	    Long portraitUuid = user.getPortraitUuid();
+	    
+	    //fill in question's and user answer's hashes 
+	    for (AssessmentQuestionResult questionResult : assessmentResult.getQuestionResults()) {
+		AssessmentQuestion question = questionResult.getAssessmentQuestion();
+		
+		List<String> answers = new LinkedList<String>();
+		
+		if (question.getType() == AssessmentConstants.QUESTION_TYPE_MULTIPLE_CHOICE) {
+		    
+		    for (AssessmentQuestionOption option : question.getOptions()) {
+			for (AssessmentOptionAnswer optionAnswer : questionResult.getOptionAnswers()) {
+			    if (optionAnswer.getAnswerBoolean() && (optionAnswer.getOptionUid().equals(option.getUid()))) {
+				answers.add(option.getOptionString());
+			    }
+			}
+		    }
+
+		} else if (question.getType() == AssessmentConstants.QUESTION_TYPE_MATCHING_PAIRS) {
+
+		} else if (question.getType() == AssessmentConstants.QUESTION_TYPE_SHORT_ANSWER) {
+		    answers.add(questionResult.getAnswerString());
+
+		} else if (question.getType() == AssessmentConstants.QUESTION_TYPE_NUMERICAL) {
+		    answers.add(questionResult.getAnswerString());
+
+		} else if (question.getType() == AssessmentConstants.QUESTION_TYPE_TRUE_FALSE) {
+		    if (questionResult.getAnswerString() != null) {
+			answers.add("" + questionResult.getAnswerBoolean());
+		    }
+		    
+		} else if (question.getType() == AssessmentConstants.QUESTION_TYPE_ESSAY) {
+		    answers.add(questionResult.getAnswerString());
+
+		} else if (question.getType() == AssessmentConstants.QUESTION_TYPE_ORDERING) {
+
+		} else if (question.getType() == AssessmentConstants.QUESTION_TYPE_MARK_HEDGING) {
+		    
+		}
+		
+		for (String answer : answers) {
+		    ConfidenceLevelDTO confidenceLevelDto = new ConfidenceLevelDTO();
+		    confidenceLevelDto.setUserId(userId);
+		    confidenceLevelDto.setPortraitUuid(portraitUuid);
+		    confidenceLevelDto.setLevel(questionResult.getConfidenceLevel());
+		    confidenceLevelDto.setQuestionHash(question.getQuestionHash());
+		    confidenceLevelDto.setAnswerHash(HashUtil.sha1(answer));
+		    
+		    confidenceLevelDtos.add(confidenceLevelDto);
+		}
+	    }
+	    
+	}
+
+	return confidenceLevelDtos;
+    }
+
     @Override
     public void forceCompleteUser(Long toolSessionId, User user) {
 	Long userId = user.getUserId().longValue();
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
===================================================================
diff -u -r373dcc4ea6d1a07c60268ceccd9d1e69d9c35f9c -rfeb6062a5128a445b1fa0095b8c9d6cf232af90f
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java	(.../IAssessmentService.java)	(revision 373dcc4ea6d1a07c60268ceccd9d1e69d9c35f9c)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java	(.../IAssessmentService.java)	(revision feb6062a5128a445b1fa0095b8c9d6cf232af90f)
@@ -28,9 +28,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.TreeMap;
 
-import org.lamsfoundation.lams.confidencelevel.ConfidenceLevel;
+import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
 import org.lamsfoundation.lams.tool.assessment.dto.AssessmentResultDTO;
 import org.lamsfoundation.lams.tool.assessment.dto.AssessmentUserDTO;
@@ -47,7 +46,6 @@
 import org.lamsfoundation.lams.tool.assessment.model.AssessmentSession;
 import org.lamsfoundation.lams.tool.assessment.model.AssessmentUser;
 import org.lamsfoundation.lams.tool.assessment.model.QuestionReference;
-import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.lamsfoundation.lams.util.ExcelCell;
 
 /**
@@ -84,6 +82,8 @@
      */
     void copyAnswersFromLeader(AssessmentUser user, AssessmentUser leader)
 	    throws IllegalAccessException, InstantiationException, InvocationTargetException, NoSuchMethodException;
+    
+    List<ConfidenceLevelDTO> getConfidenceLevels(Long toolSessionId);
 
     /**
      * Stores date when user has started activity with time limit.
@@ -435,24 +435,6 @@
     void changeQuestionResultMark(Long questionResultUid, float newMark);
 
     void notifyTeachersOnAttemptCompletion(Long sessionId, String userName);
-    
-    /**
-     * Returns all confidence levels user left in this activity.
-     *
-     * @param userId
-     * @param toolSessionId
-     * @return
-     */
-    List<ConfidenceLevel> getConfidenceLevelsByUser(Integer userId, Long toolSessionId);
-    
-    /**
-     * Returns all confidence levels user left in this activity.
-     *
-     * @param userId
-     * @param toolSessionId
-     * @return
-     */
-    List<ConfidenceLevel> getConfidenceLevelsByQuestionAndSession(Long questionUid, Long toolSessionId);
 
     /**
      * Get a message from the language files with the given key
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
===================================================================
diff -u -r373dcc4ea6d1a07c60268ceccd9d1e69d9c35f9c -rfeb6062a5128a445b1fa0095b8c9d6cf232af90f
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java	(.../LearningAction.java)	(revision 373dcc4ea6d1a07c60268ceccd9d1e69d9c35f9c)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java	(.../LearningAction.java)	(revision feb6062a5128a445b1fa0095b8c9d6cf232af90f)
@@ -56,7 +56,6 @@
 import org.apache.struts.action.ActionRedirect;
 import org.apache.tomcat.util.json.JSONException;
 import org.apache.tomcat.util.json.JSONObject;
-import org.lamsfoundation.lams.confidencelevel.ConfidenceLevel;
 import org.lamsfoundation.lams.learning.web.bean.ActivityPositionDTO;
 import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
 import org.lamsfoundation.lams.notebook.model.NotebookEntry;
@@ -367,22 +366,6 @@
 		questionDto.setMatchingPairOptions(new LinkedHashSet<OptionDTO>(optionsSortedByOptionString));
 	    }
 	}
-	
-	// populate user entered confidence levels
-	if (assessment.isEnableConfidenceLevels()) {
-	    List<ConfidenceLevel> confidenceLevels = service.getConfidenceLevelsByUser(user.getUserId().intValue(),
-		    toolSessionId);
-	    
-	    for (QuestionDTO questionDto : questionDtos) {
-		//find according confidenceLevel
-		for (ConfidenceLevel confidenceLevel : confidenceLevels) {
-		    if (questionDto.getUid().equals(confidenceLevel.getQuestionUid())) {
-			questionDto.setConfidenceLevel(confidenceLevel.getConfidenceLevel());
-			break;
-		    }
-		}
-	    }
-	}
 
 	//paging
 	List<Set<QuestionDTO>> pagedQuestionDtos = new ArrayList<Set<QuestionDTO>>();
@@ -1219,6 +1202,7 @@
 			questionDto.setMark(questionResult.getMark());
 			questionDto.setResponseSubmitted(questionResult.getFinishDate() != null);
 			questionDto.setPenalty(questionResult.getPenalty());
+			questionDto.setConfidenceLevel(questionResult.getConfidenceLevel());
 
 			for (OptionDTO optionDto : questionDto.getOptionDtos()) {
 			    
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
===================================================================
diff -u -r373dcc4ea6d1a07c60268ceccd9d1e69d9c35f9c -rfeb6062a5128a445b1fa0095b8c9d6cf232af90f
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision 373dcc4ea6d1a07c60268ceccd9d1e69d9c35f9c)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision feb6062a5128a445b1fa0095b8c9d6cf232af90f)
@@ -50,7 +50,6 @@
 import org.apache.tomcat.util.json.JSONArray;
 import org.apache.tomcat.util.json.JSONException;
 import org.apache.tomcat.util.json.JSONObject;
-import org.lamsfoundation.lams.confidencelevel.ConfidenceLevel;
 import org.lamsfoundation.lams.gradebook.util.GradebookConstants;
 import org.lamsfoundation.lams.tool.assessment.AssessmentConstants;
 import org.lamsfoundation.lams.tool.assessment.dto.AssessmentResultDTO;
@@ -485,10 +484,6 @@
 	int totalPages = new Double(
 		Math.ceil(new Integer(countSessionUsers).doubleValue() / new Integer(rowLimit).doubleValue()))
 			.intValue();
-	
-	List<ConfidenceLevel> confidenceLevels = assessment.isEnableConfidenceLevels()
-		? service.getConfidenceLevelsByQuestionAndSession(questionUid, sessionId)
-		: null;
 
 	JSONArray rows = new JSONArray();
 	int i = 1;
@@ -506,17 +501,9 @@
 		userData.put(fullName);
 		userData.put(AssessmentEscapeUtils.printResponsesForJqgrid(questionResult));
 		
-		// prepare for displaying purposes confidence levels 
+		// show confidence levels if this feature is turned ON 
 		if (assessment.isEnableConfidenceLevels()) {
-		    //find according confidenceLevel
-		    int confidence = -1;
-		    for (ConfidenceLevel confidenceLevel : confidenceLevels) {
-			if (questionResult.getAssessmentQuestion().getUid().equals(confidenceLevel.getQuestionUid())) {
-			    confidence = confidenceLevel.getConfidenceLevel();
-			    break;
-			}
-		    }
-		    userData.put(confidence);
+		    userData.put(questionResult.getConfidenceLevel());
 		}
 		
 		userData.put(questionResult.getMark());
Fisheye: Tag feb6062a5128a445b1fa0095b8c9d6cf232af90f refers to a dead (removed) revision in file `lams_tool_assessment/web/includes/javascript/monitoring.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_assessment/web/pages/monitoring/monitoring.jsp
===================================================================
diff -u -r373dcc4ea6d1a07c60268ceccd9d1e69d9c35f9c -rfeb6062a5128a445b1fa0095b8c9d6cf232af90f
--- lams_tool_assessment/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision 373dcc4ea6d1a07c60268ceccd9d1e69d9c35f9c)
+++ lams_tool_assessment/web/pages/monitoring/monitoring.jsp	(.../monitoring.jsp)	(revision feb6062a5128a445b1fa0095b8c9d6cf232af90f)
@@ -40,7 +40,7 @@
  		<script type="text/javascript" src="${lams}includes/javascript/jquery.cookie.js"></script>
  		<script type="text/javascript" src="${lams}includes/javascript/download.js"></script>
  		<script type="text/javascript" src="${lams}/includes/javascript/portrait.js" ></script>
- 		<script type="text/javascript" src="<html:rewrite page='/includes/javascript/monitoring.js'/>"></script>
+ 		<script type="text/javascript" src="${lams}/includes/javascript/jqGrid.confidenceLevelFormattter.js"></script>
  		
 		<script>        
 		    function doSelectTab(tabId) {
Index: lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp
===================================================================
diff -u -r373dcc4ea6d1a07c60268ceccd9d1e69d9c35f9c -rfeb6062a5128a445b1fa0095b8c9d6cf232af90f
--- lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp	(.../questionsummary.jsp)	(revision 373dcc4ea6d1a07c60268ceccd9d1e69d9c35f9c)
+++ lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp	(.../questionsummary.jsp)	(revision feb6062a5128a445b1fa0095b8c9d6cf232af90f)
@@ -15,7 +15,7 @@
 		
 		<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.locale-en.js"></script>
 	 	<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.js"></script>
-	 	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/monitoring.js'/>"></script>
+	 	<script type="text/javascript" src="${lams}includes/javascript/jqGrid.confidenceLevelFormattter.js"></script>
   	    <script>
   	    	var isEdited = false;
   	    	var previousCellValue = "";
@@ -49,11 +49,7 @@
 							{name:'userName',index:'userName', width:120, searchoptions: { clearSearch: false }},
 	  				   		{name:'response', index:'response', width:427, sortable:false, search:false},
 	  		  			   	<c:if test="${sessionMap.assessment.enableConfidenceLevels}">
-			  			   		{name:'confidence', index:'confidence', width: 80, classes: 'vertical-align',
-			                        formatter: function (cellvalue) {
-			                            return gradientNumberFormat(cellvalue);
-			                        }
-				  			   	},
+			  			   		{name:'confidence', index:'confidence', width: 80, classes: 'vertical-align', formatter: gradientNumberFormatter},
 			  			  	</c:if>
 	  				   		{name:'grade', index:'grade', width:80, sorttype:"float", search:false, editable:true, editoptions: {size:4, maxlength: 4}, align:"right", classes: 'vertical-align' }		
 	  				   	],
Index: lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp
===================================================================
diff -u -r373dcc4ea6d1a07c60268ceccd9d1e69d9c35f9c -rfeb6062a5128a445b1fa0095b8c9d6cf232af90f
--- lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp	(.../usersummary.jsp)	(revision 373dcc4ea6d1a07c60268ceccd9d1e69d9c35f9c)
+++ lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp	(.../usersummary.jsp)	(revision feb6062a5128a445b1fa0095b8c9d6cf232af90f)
@@ -11,9 +11,9 @@
 		<link type="text/css" href="${lams}css/jquery.jqGrid.css" rel="stylesheet" />
 		<link href="<html:rewrite page='/includes/css/monitoring.css'/>" rel="stylesheet" type="text/css">	
 
-		<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.jqGrid.locale-en.js"></script>
-	 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.jqGrid.js"></script>
-	 	<script type="text/javascript" src="<html:rewrite page='/includes/javascript/monitoring.js'/>"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.locale-en.js"></script>
+	 	<script type="text/javascript" src="${lams}includes/javascript/jquery.jqGrid.js"></script>
+	 	<script type="text/javascript" src="${lams}includes/javascript/jqGrid.confidenceLevelFormattter.js"></script>
   	    <script>
 	    	var isEdited = false;
   	    	var previousCellValue = "";  	    	
@@ -45,11 +45,7 @@
 	  				   		{name:'time', index:'time', width:150, sorttype:'date', datefmt:'Y-m-d'},
 	  				   		{name:'response', index:'response', width:341, sortable:false},
 	  		  			   	<c:if test="${sessionMap.assessment.enableConfidenceLevels}">
-			  			   		{name:'confidence', index:'confidence', width: 80, classes: 'vertical-align',
-			                        formatter: function (cellvalue) {
-			                            return gradientNumberFormat(cellvalue);
-			                        }
-				  			   	},
+			  			   		{name:'confidence', index:'confidence', width: 80, classes: 'vertical-align', formatter: gradientNumberFormatter},
 			  			  	</c:if>
 	  				   		{name:'grade', index:'grade', width:80, sorttype:"float", editable:true, editoptions: {size:4, maxlength: 4}, align:"right", classes: 'vertical-align' }		
 	  				   	],
Index: lams_tool_assessment/web/pages/monitoring/summary.jsp
===================================================================
diff -u -r373dcc4ea6d1a07c60268ceccd9d1e69d9c35f9c -rfeb6062a5128a445b1fa0095b8c9d6cf232af90f
--- lams_tool_assessment/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision 373dcc4ea6d1a07c60268ceccd9d1e69d9c35f9c)
+++ lams_tool_assessment/web/pages/monitoring/summary.jsp	(.../summary.jsp)	(revision feb6062a5128a445b1fa0095b8c9d6cf232af90f)
@@ -103,11 +103,7 @@
 	  			   	{name:'title', index:'title', width: 200},
 	  			   	{name:'response', index:'response', width:443, sortable:false},
 	  			   	<c:if test="${sessionMap.assessment.enableConfidenceLevels}">
-	  			   		{name:'confidence', index:'confidence', width: 80, classes: 'vertical-align',
-	                        formatter: function (cellvalue) {
-	                            return gradientNumberFormat(cellvalue);
-	                        }
-		  			   	},
+	  			   		{name:'confidence', index:'confidence', width: 80, classes: 'vertical-align', formatter: gradientNumberFormatter},
 	  			  	</c:if>
 	  			   	{name:'grade', index:'grade', width:80, sorttype:"float", editable:true, editoptions: {size:4, maxlength: 4}, align:"right", classes: 'vertical-align' }
 			   	],