Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -r5eca912646ea4d81e3cf72fa0fe8b0567aea3c3b -rfbaf103704f81cec6090f430a55f12349113eb47
Binary files differ
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
===================================================================
diff -u -rf69d13d57c7cae5e033c4ef3957ec9ad6520e049 -rfbaf103704f81cec6090f430a55f12349113eb47
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java	(.../AssessmentResultDAOHibernate.java)	(revision f69d13d57c7cae5e033c4ef3957ec9ad6520e049)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java	(.../AssessmentResultDAOHibernate.java)	(revision fbaf103704f81cec6090f430a55f12349113eb47)
@@ -31,6 +31,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
@@ -223,6 +224,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_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
===================================================================
diff -u -r68a00ed36298398bdd7646b440a122d373bd75a1 -rfbaf103704f81cec6090f430a55f12349113eb47
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java	(.../McService.java)	(revision 68a00ed36298398bdd7646b440a122d373bd75a1)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java	(.../McService.java)	(revision fbaf103704f81cec6090f430a55f12349113eb47)
@@ -54,6 +54,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.ConfidenceLevelDTO;
 import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler;
 import org.lamsfoundation.lams.gradebook.service.IGradebookService;
 import org.lamsfoundation.lams.learning.service.ILearnerService;
@@ -1565,6 +1566,11 @@
     public List<ToolOutput> getToolOutputs(String name, Long toolContentId) {
 	return mcOutputFactory.getToolOutputs(name, this, toolContentId);
     }
+    
+    @Override
+    public List<ConfidenceLevelDTO> getConfidenceLevels(Long toolSessionId) {
+	return null;
+    }
 
     @Override
     public void forceCompleteUser(Long toolSessionId, User user) {
Index: lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r556d465d0c2dba467f2acef7d29c0f8261ecf84b -rfbaf103704f81cec6090f430a55f12349113eb47
--- lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 556d465d0c2dba467f2acef7d29c0f8261ecf84b)
+++ lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision fbaf103704f81cec6090f430a55f12349113eb47)
@@ -210,5 +210,9 @@
 label.average.mark  =Average mark
 message.monitoring.edit.activity.warning  =Warning: if you edit and modify a question or change an answer that a leader has already answered, then the mark for the whole group for the modified question will be deleted permanently as it is assumed that the question has changed.
 
+label.show.confidence.level  =Show confidence levels from the following activity
+label.no.confidence.levels.activities  =There are no activities with confidence levels to choose from.
+label.save.learning.design  =In order to select activity with  confidence levels please save your sequence first.
 
+
 #======= End labels: Exported 203 labels for en AU =====