Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentUserDAO.java
===================================================================
diff -u -r5c770157545dea3dbc72e22a1dd1107c56cf22eb -r5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentUserDAO.java	(.../AssessmentUserDAO.java)	(revision 5c770157545dea3dbc72e22a1dd1107c56cf22eb)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentUserDAO.java	(.../AssessmentUserDAO.java)	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -33,14 +33,18 @@
 
     AssessmentUser getUserByUserIDAndSessionID(Long userID, Long sessionId);
 
-    AssessmentUser getUserByUserIDAndContentID(Long userId, Long contentId);
+    AssessmentUser getUserCreatedAssessment(Long userId, Long contentId);
+    
+    AssessmentUser getUserByIdAndContent(Long userId, Long contentId);
 
     List<AssessmentUser> getBySessionID(Long sessionId);
 
     List<AssessmentUserDTO> getPagedUsersBySession(Long sessionId, int page, int size, String sortBy, String sortOrder,
 	    String searchString, IUserManagementService userManagementService);
 
     int getCountUsersBySession(Long sessionId, String searchString);
+    
+    int getCountUsersByContentId(Long contentId);
 
     List<AssessmentUserDTO> getPagedUsersBySessionAndQuestion(Long sessionId, Long questionUid, int page, int size,
 	    String sortBy, String sortOrder, String searchString, IUserManagementService userManagementService);
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
===================================================================
diff -u -r5c770157545dea3dbc72e22a1dd1107c56cf22eb -r5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java	(.../AssessmentUserDAOHibernate.java)	(revision 5c770157545dea3dbc72e22a1dd1107c56cf22eb)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java	(.../AssessmentUserDAOHibernate.java)	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -40,8 +40,6 @@
 @Repository
 public class AssessmentUserDAOHibernate extends LAMSBaseDAO implements AssessmentUserDAO {
 
-    private static final String FIND_BY_USER_ID_CONTENT_ID = "from " + AssessmentUser.class.getName()
-	    + " as u where u.userId =? and u.assessment.contentId=?";
     private static final String FIND_BY_USER_ID_SESSION_ID = "from " + AssessmentUser.class.getName()
 	    + " as u where u.userId =? and u.session.sessionId=?";
     private static final String FIND_BY_SESSION_ID = "from " + AssessmentUser.class.getName()
@@ -74,7 +72,10 @@
 
     @SuppressWarnings("rawtypes")
     @Override
-    public AssessmentUser getUserByUserIDAndContentID(Long userId, Long contentId) {
+    public AssessmentUser getUserCreatedAssessment(Long userId, Long contentId) {
+	final String FIND_BY_USER_ID_CONTENT_ID = "from " + AssessmentUser.class.getName()
+		+ " as u where u.userId =? and u.assessment.contentId=?";
+
 	List list = doFind(FIND_BY_USER_ID_CONTENT_ID, new Object[] { userId, contentId });
 	if (list == null || list.size() == 0) {
 	    return null;
@@ -83,6 +84,18 @@
     }
 
     @Override
+    public AssessmentUser getUserByIdAndContent(Long userId, Long contentId) {
+	final String FIND_BY_USER_ID_CONTENT_ID = "from " + AssessmentUser.class.getName()
+		+ " as u where u.userId =? and u.session.assessment.contentId=?";
+
+	List list = doFind(FIND_BY_USER_ID_CONTENT_ID, new Object[] { userId, contentId });
+	if (list == null || list.size() == 0) {
+	    return null;
+	}
+	return (AssessmentUser) list.get(0);
+    }
+
+    @Override
     @SuppressWarnings("unchecked")
     public List<AssessmentUser> getBySessionID(Long sessionId) {
 	return (List<AssessmentUser>) this.doFind(FIND_BY_SESSION_ID, sessionId);
@@ -172,7 +185,24 @@
 	    return ((Number) list.get(0)).intValue();
 	}
     }
+    
+    @Override
+    public int getCountUsersByContentId(Long contentId) {
 
+	String LOAD_USERS_ORDERED_BY_NAME = "SELECT COUNT(*) FROM " + AssessmentUser.class.getName() + " user"
+		+ " WHERE user.assessment.contentId = :contentId ";
+
+	Query query = getSession().createQuery(LOAD_USERS_ORDERED_BY_NAME);
+	query.setLong("contentId", contentId);
+	List list = query.list();
+
+	if ((list == null) || (list.size() == 0)) {
+	    return 0;
+	} else {
+	    return ((Number) list.get(0)).intValue();
+	}
+    }
+
     @SuppressWarnings("rawtypes")
     @Override
     public Object[] getStatsMarksBySession(Long sessionId) {
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/TblAssessmentDTO.java
===================================================================
diff -u
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/TblAssessmentDTO.java	(revision 0)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/TblAssessmentDTO.java	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -0,0 +1,46 @@
+package org.lamsfoundation.lams.tool.assessment.dto;
+
+import java.util.Set;
+
+import org.lamsfoundation.lams.tool.assessment.model.Assessment;
+import org.lamsfoundation.lams.tool.assessment.model.AssessmentQuestion;
+
+public class TblAssessmentDTO {
+    private String activityTitle;
+    private Assessment assessment;
+    private int attemptedLearnersNumber;
+    private Set<AssessmentQuestion> questions;
+
+    public String getActivityTitle() {
+	return activityTitle;
+    }
+
+    public void setActivityTitle(String activityTitle) {
+	this.activityTitle = activityTitle;
+    }
+
+    public Assessment getAssessment() {
+	return assessment;
+    }
+
+    public void setAssessment(Assessment assessment) {
+	this.assessment = assessment;
+    }
+
+    public int getAttemptedLearnersNumber() {
+	return attemptedLearnersNumber;
+    }
+
+    public void setAttemptedLearnersNumber(int attemptedLearnersNumber) {
+	this.attemptedLearnersNumber = attemptedLearnersNumber;
+    }
+
+    public Set<AssessmentQuestion> getQuestions() {
+	return questions;
+    }
+
+    public void setQuestions(Set<AssessmentQuestion> questions) {
+	this.questions = questions;
+    }
+
+}
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/TblAssessmentQuestionDTO.java
===================================================================
diff -u
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/TblAssessmentQuestionDTO.java	(revision 0)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/TblAssessmentQuestionDTO.java	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -0,0 +1,48 @@
+package org.lamsfoundation.lams.tool.assessment.dto;
+
+import java.util.List;
+
+import org.lamsfoundation.lams.tool.assessment.model.AssessmentQuestion;
+
+/**
+ * TBL modification of Assessment tool's QuestionSummary.
+ */
+public class TblAssessmentQuestionDTO {
+    private AssessmentQuestion question;
+    private List<TblAssessmentQuestionResultDTO> sessionQuestionResults;
+
+    private String questionTypeLabel;
+    private String correctAnswer;
+
+    public AssessmentQuestion getQuestion() {
+	return question;
+    }
+
+    public void setQuestion(AssessmentQuestion question) {
+	this.question = question;
+    }
+
+    public List<TblAssessmentQuestionResultDTO> getSessionQuestionResults() {
+	return sessionQuestionResults;
+    }
+
+    public void setSessionQuestionResults(List<TblAssessmentQuestionResultDTO> sessionQuestionResults) {
+	this.sessionQuestionResults = sessionQuestionResults;
+    }
+
+    public String getQuestionTypeLabel() {
+	return questionTypeLabel;
+    }
+
+    public void setQuestionTypeLabel(String questionTypeLabel) {
+	this.questionTypeLabel = questionTypeLabel;
+    }
+
+    public String getCorrectAnswer() {
+	return correctAnswer;
+    }
+
+    public void setCorrectAnswer(String correctAnswer) {
+	this.correctAnswer = correctAnswer;
+    }
+}
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/TblAssessmentQuestionResultDTO.java
===================================================================
diff -u
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/TblAssessmentQuestionResultDTO.java	(revision 0)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/TblAssessmentQuestionResultDTO.java	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -0,0 +1,24 @@
+package org.lamsfoundation.lams.tool.assessment.dto;
+
+public class TblAssessmentQuestionResultDTO {
+
+    private boolean correct;
+    private String answer;
+
+    public boolean isCorrect() {
+	return correct;
+    }
+
+    public void setCorrect(boolean correct) {
+	this.correct = correct;
+    }
+
+    public String getAnswer() {
+	return answer;
+    }
+
+    public void setAnswer(String answer) {
+	this.answer = answer;
+    }
+
+}
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java
===================================================================
diff -u -r248e47a1f8714d3e57be1e4dc12b4fae4f396cb3 -r5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java	(.../AssessmentOutputFactory.java)	(revision 248e47a1f8714d3e57be1e4dc12b4fae4f396cb3)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java	(.../AssessmentOutputFactory.java)	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -119,7 +119,7 @@
 
 	TreeMap<String, ToolOutput> output = new TreeMap<String, ToolOutput>();
 
-	AssessmentSession session = assessmentService.getAssessmentSessionBySessionId(toolSessionId);
+	AssessmentSession session = assessmentService.getSessionBySessionId(toolSessionId);
 	if ((session != null) && (session.getAssessment() != null)) {
 	    Assessment assessment = session.getAssessment();
 
@@ -162,7 +162,7 @@
     public ToolOutput getToolOutput(String name, IAssessmentService assessmentService, Long toolSessionId,
 	    Long learnerId) {
 	if (name != null) {
-	    AssessmentSession session = assessmentService.getAssessmentSessionBySessionId(toolSessionId);
+	    AssessmentSession session = assessmentService.getSessionBySessionId(toolSessionId);
 
 	    if ((session != null) && (session.getAssessment() != null)) {
 		Assessment assessment = session.getAssessment();
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
===================================================================
diff -u -r9c5964cc6b8152e9ddb6651e900b7b74f0a4e110 -r5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision 9c5964cc6b8152e9ddb6651e900b7b74f0a4e110)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -164,7 +164,7 @@
     @Override
     public boolean isUserGroupLeader(AssessmentUser user, Long toolSessionId) {
 
-	AssessmentSession session = getAssessmentSessionBySessionId(toolSessionId);
+	AssessmentSession session = getSessionBySessionId(toolSessionId);
 	AssessmentUser groupLeader = session.getGroupLeader();
 
 	return (groupLeader != null) && user.getUserId().equals(groupLeader.getUserId());
@@ -176,7 +176,7 @@
 	    return null;
 	}
 
-	AssessmentSession assessmentSession = getAssessmentSessionBySessionId(toolSessionId);
+	AssessmentSession assessmentSession = getSessionBySessionId(toolSessionId);
 	AssessmentUser leader = assessmentSession.getGroupLeader();
 	// check leader select tool for a leader only in case QA tool doesn't know it. As otherwise it will screw
 	// up previous scratches done
@@ -343,6 +343,11 @@
     public int getCountUsersBySession(Long sessionId, String searchString) {
 	return assessmentUserDao.getCountUsersBySession(sessionId, searchString);
     }
+    
+    @Override
+    public int getCountUsersByContentId(Long contentId) {
+	return assessmentUserDao.getCountUsersByContentId(contentId);
+    }
 
     @Override
     public List<AssessmentUserDTO> getPagedUsersBySessionAndQuestion(Long sessionId, Long questionUid, int page,
@@ -396,9 +401,14 @@
     }
 
     @Override
-    public AssessmentUser getUserByIDAndContent(Long userId, Long contentId) {
-	return assessmentUserDao.getUserByUserIDAndContentID(userId, contentId);
+    public AssessmentUser getUserCreatedAssessment(Long userId, Long contentId) {
+	return assessmentUserDao.getUserCreatedAssessment(userId, contentId);
     }
+    
+    @Override
+    public AssessmentUser getUserByIdAndContent(Long userId, Long contentId) {
+	return assessmentUserDao.getUserByIdAndContent(userId, contentId);
+    }
 
     @Override
     public AssessmentUser getUserByIDAndSession(Long userId, Long sessionId) {
@@ -442,9 +452,14 @@
     }
 
     @Override
-    public AssessmentSession getAssessmentSessionBySessionId(Long sessionId) {
+    public AssessmentSession getSessionBySessionId(Long sessionId) {
 	return assessmentSessionDao.getSessionBySessionId(sessionId);
     }
+    
+    @Override
+    public List<AssessmentSession> getSessionsByContentId(Long toolContentId) {
+	return assessmentSessionDao.getByContentId(toolContentId);
+    }
 
     @Override
     public void setAttemptStarted(Assessment assessment, AssessmentUser assessmentUser, Long toolSessionId) {
@@ -1280,7 +1295,7 @@
 		    // in case of UseSelectLeaderToolOuput - display only one user
 		    if (assessment.isUseSelectLeaderToolOuput()) {
 
-			AssessmentSession session = getAssessmentSessionBySessionId(sessionId);
+			AssessmentSession session = getSessionBySessionId(sessionId);
 			AssessmentUser groupLeader = session.getGroupLeader();
 
 			if (groupLeader != null) {
@@ -1691,7 +1706,7 @@
 		sessionTitle[0] = new ExcelCell(sessionDTO.getSessionName(), true);
 		userSummaryTab.add(sessionTitle);
 
-		AssessmentSession assessmentSession = getAssessmentSessionBySessionId(sessionDTO.getSessionId());
+		AssessmentSession assessmentSession = getSessionBySessionId(sessionDTO.getSessionId());
 
 		Set<AssessmentUser> assessmentUsers = assessmentSession.getAssessmentUsers();
 
@@ -2489,7 +2504,7 @@
 
 	    // reset it to new toolContentId
 	    toolContentObj.setContentId(toolContentId);
-	    AssessmentUser user = assessmentUserDao.getUserByUserIDAndContentID(new Long(newUserUid.longValue()),
+	    AssessmentUser user = assessmentUserDao.getUserCreatedAssessment(new Long(newUserUid.longValue()),
 		    toolContentId);
 	    if (user == null) {
 		user = new AssessmentUser();
@@ -2751,7 +2766,7 @@
     public void forceCompleteUser(Long toolSessionId, User user) {
 	Long userId = user.getUserId().longValue();
 
-	AssessmentSession session = getAssessmentSessionBySessionId(toolSessionId);
+	AssessmentSession session = getSessionBySessionId(toolSessionId);
 	if ((session == null) || (session.getAssessment() == null)) {
 	    return;
 	}
@@ -2929,7 +2944,7 @@
 		    "Assessment Tool does not support Overall Feedback for REST Authoring. " + toolContentJSON);
 	}
 
-	AssessmentUser assessmentUser = getUserByIDAndContent(userID.longValue(), toolContentID);
+	AssessmentUser assessmentUser = getUserCreatedAssessment(userID.longValue(), toolContentID);
 	if (assessmentUser == null) {
 	    assessmentUser = new AssessmentUser();
 	    assessmentUser.setFirstName(toolContentJSON.getString("firstName"));
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
===================================================================
diff -u -rfeb6062a5128a445b1fa0095b8c9d6cf232af90f -r5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java	(.../IAssessmentService.java)	(revision feb6062a5128a445b1fa0095b8c9d6cf232af90f)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java	(.../IAssessmentService.java)	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -122,6 +122,8 @@
 	    String searchString);
 
     int getCountUsersBySession(Long sessionId, String searchString);
+    
+    int getCountUsersByContentId(Long contentId);
 
     List<AssessmentUserDTO> getPagedUsersBySessionAndQuestion(Long sessionId, Long questionUid, int page, int size,
 	    String sortBy, String sortOrder, String searchString);
@@ -151,12 +153,20 @@
     void createUser(AssessmentUser assessmentUser);
 
     /**
+     * Get user created current Assessment.
+     *
+     * @param long1
+     * @return
+     */
+    AssessmentUser getUserCreatedAssessment(Long userID, Long contentId);
+    
+    /**
      * Get user by given userID and toolContentID.
      *
      * @param long1
      * @return
      */
-    AssessmentUser getUserByIDAndContent(Long userID, Long contentId);
+    AssessmentUser getUserByIdAndContent(Long userID, Long contentId);    
 
     /**
      * Get user by sessionID and UserID
@@ -197,7 +207,15 @@
      * @param sessionId
      * @return
      */
-    AssessmentSession getAssessmentSessionBySessionId(Long sessionId);
+    AssessmentSession getSessionBySessionId(Long sessionId);
+ 
+    /**
+     * Get all assessment toolSessions by toolContentId
+     *
+     * @param toolContentId
+     * @return
+     */
+    List<AssessmentSession> getSessionsByContentId(Long toolContentId);
 
     /**
      * Save or update assessment result.
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
===================================================================
diff -u -ra8acf18e203ec2888e353d2eaef939f471252088 -r5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision a8acf18e203ec2888e353d2eaef939f471252088)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java	(.../AuthoringAction.java)	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -376,7 +376,7 @@
 	    HttpSession ss = SessionManager.getSession();
 	    // get back login user DTO
 	    UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
-	    assessmentUser = service.getUserByIDAndContent(new Long(user.getUserID().intValue()),
+	    assessmentUser = service.getUserCreatedAssessment(new Long(user.getUserID().intValue()),
 		    assessmentPO.getContentId());
 	    if (assessmentUser == null) {
 		assessmentUser = new AssessmentUser(user, assessmentPO);
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
===================================================================
diff -u -r9c5964cc6b8152e9ddb6651e900b7b74f0a4e110 -r5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java	(.../LearningAction.java)	(revision 9c5964cc6b8152e9ddb6651e900b7b74f0a4e110)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java	(.../LearningAction.java)	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -416,7 +416,7 @@
 	IAssessmentService service = getAssessmentService();
 	Long toolSessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
 
-	AssessmentSession session = service.getAssessmentSessionBySessionId(toolSessionId);
+	AssessmentSession session = service.getSessionBySessionId(toolSessionId);
 	AssessmentUser leader = session.getGroupLeader();
 
 	//in case of time limit - prevent user from seeing questions page longer than time limit allows
@@ -1296,7 +1296,7 @@
 	AssessmentUser assessmentUser = service.getUserByIDAndSession(new Long(user.getUserID().intValue()), sessionId);
 
 	if (assessmentUser == null) {
-	    AssessmentSession session = service.getAssessmentSessionBySessionId(sessionId);
+	    AssessmentSession session = service.getSessionBySessionId(sessionId);
 	    assessmentUser = new AssessmentUser(user, session);
 	    service.createUser(assessmentUser);
 	}
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
===================================================================
diff -u -r5c770157545dea3dbc72e22a1dd1107c56cf22eb -r5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision 5c770157545dea3dbc72e22a1dd1107c56cf22eb)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java	(.../MonitoringAction.java)	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -361,7 +361,7 @@
 	//in case of UseSelectLeaderToolOuput - display only one user
 	if (assessment.isUseSelectLeaderToolOuput()) {
 
-	    AssessmentSession session = service.getAssessmentSessionBySessionId(sessionId);
+	    AssessmentSession session = service.getSessionBySessionId(sessionId);
 	    AssessmentUser groupLeader = session.getGroupLeader();
 
 	    if (groupLeader != null) {
@@ -449,7 +449,7 @@
 	//in case of UseSelectLeaderToolOuput - display only one user
 	if (assessment.isUseSelectLeaderToolOuput()) {
 
-	    AssessmentSession session = service.getAssessmentSessionBySessionId(sessionId);
+	    AssessmentSession session = service.getSessionBySessionId(sessionId);
 	    AssessmentUser groupLeader = session.getGroupLeader();
 
 	    if (groupLeader != null) {
@@ -590,14 +590,14 @@
 	    HttpServletResponse response) throws IOException {
 	initAssessmentService();
 	String sessionMapID = request.getParameter(AssessmentConstants.ATTR_SESSION_MAP_ID);
-	SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
-		.getAttribute(sessionMapID);
 	String fileName = null;
 	boolean showUserNames = true;
 
 	Long contentId = null;
 	List<SessionDTO> sessionDtos;
-	if (sessionMap != null) {
+	if (sessionMapID != null) {
+	    SessionMap<String, Object> sessionMap = (SessionMap<String, Object>) request.getSession()
+		    .getAttribute(sessionMapID);
 	    request.setAttribute(AssessmentConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
 	    contentId = (Long) sessionMap.get(AssessmentConstants.ATTR_TOOL_CONTENT_ID);
 	    showUserNames = true;
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/TblMonitoringAction.java
===================================================================
diff -u
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/TblMonitoringAction.java	(revision 0)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/TblMonitoringAction.java	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -0,0 +1,454 @@
+package org.lamsfoundation.lams.tool.assessment.web.action;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+import javax.servlet.ServletException;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.log4j.Logger;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.tomcat.util.json.JSONException;
+import org.lamsfoundation.lams.learningdesign.Activity;
+import org.lamsfoundation.lams.learningdesign.ToolActivity;
+import org.lamsfoundation.lams.lesson.Lesson;
+import org.lamsfoundation.lams.tool.assessment.AssessmentConstants;
+import org.lamsfoundation.lams.tool.assessment.dto.TblAssessmentDTO;
+import org.lamsfoundation.lams.tool.assessment.dto.AssessmentResultDTO;
+import org.lamsfoundation.lams.tool.assessment.dto.OptionDTO;
+import org.lamsfoundation.lams.tool.assessment.dto.QuestionDTO;
+import org.lamsfoundation.lams.tool.assessment.dto.QuestionSummary;
+import org.lamsfoundation.lams.tool.assessment.dto.SessionDTO;
+import org.lamsfoundation.lams.tool.assessment.dto.TblAssessmentQuestionDTO;
+import org.lamsfoundation.lams.tool.assessment.dto.TblAssessmentQuestionResultDTO;
+import org.lamsfoundation.lams.tool.assessment.model.Assessment;
+import org.lamsfoundation.lams.tool.assessment.model.AssessmentQuestion;
+import org.lamsfoundation.lams.tool.assessment.model.AssessmentQuestionOption;
+import org.lamsfoundation.lams.tool.assessment.model.AssessmentQuestionResult;
+import org.lamsfoundation.lams.tool.assessment.model.AssessmentResult;
+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.tool.assessment.service.IAssessmentService;
+import org.lamsfoundation.lams.tool.assessment.util.AssessmentEscapeUtils;
+import org.lamsfoundation.lams.tool.assessment.util.AssessmentSessionComparator;
+import org.lamsfoundation.lams.tool.assessment.util.SequencableComparator;
+import org.lamsfoundation.lams.util.ExcelCell;
+import org.lamsfoundation.lams.util.ExcelUtil;
+import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.action.LamsDispatchAction;
+import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+public class TblMonitoringAction extends LamsDispatchAction {
+    private static Logger logger = Logger.getLogger(TblMonitoringAction.class.getName());
+    
+    private IAssessmentService assessmentService;
+    
+    /**
+    * Shows ira page in case of Assessment activity
+    */
+   public ActionForward iraAssessment(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+       initAssessmentService();
+
+	Long toolContentId = WebUtil.readLongParam(request, "assessmentToolContentIds");
+	String assessmentActivityTitle = request.getParameter("assessmentActivityTitles");
+	
+	String[] toolContentIds = new String[] {toolContentId.toString()};
+	String[] activityTitles = new String[] {assessmentActivityTitle};
+	
+	List<TblAssessmentDTO> assessmentDtos = getAssessmentDtos(toolContentIds, activityTitles);
+	request.setAttribute("assessmentDtos", assessmentDtos);
+	
+	request.setAttribute(AttributeNames.PARAM_TOOL_CONTENT_ID, toolContentId);
+	request.setAttribute("isIraAssessment", true);
+	return mapping.findForward("assessment");
+   }
+   
+   private List<TblAssessmentDTO> getAssessmentDtos(String[] toolContentIds, String[] activityTitles) {
+	List<TblAssessmentDTO> assessmentDtos = new ArrayList<TblAssessmentDTO>();
+	int i = 0;
+	for (String toolContentIdStr : toolContentIds) {
+	    String activityTitle = activityTitles[i++];
+	    
+	    //skip empty contentIds
+	    if (toolContentIdStr.length() == 0) {
+		continue;
+	    }
+	    Long toolContentId = Long.parseLong(toolContentIdStr);
+	    
+	    TblAssessmentDTO assessmentDto = new TblAssessmentDTO();
+
+	    int attemptedLearnersNumber = assessmentService.getCountUsersByContentId(toolContentId);
+	    assessmentDto.setAttemptedLearnersNumber(attemptedLearnersNumber);
+	    assessmentDto.setActivityTitle(activityTitle);
+
+	    Assessment assessment = assessmentService.getAssessmentByContentId(toolContentId);
+	    assessmentDto.setAssessment(assessment);
+	    assessmentDto.setQuestions(prepareQuestionsList(assessment));
+	    assessmentDtos.add(assessmentDto);
+	}
+	
+	return assessmentDtos;
+   }
+   
+   private Set<AssessmentQuestion> prepareQuestionsList(Assessment assessment) {
+	// question list to display
+	Set<AssessmentQuestion> questions = new TreeSet<AssessmentQuestion>();
+	boolean hasRandomQuestion = false;
+	for (QuestionReference reference : (Set<QuestionReference>) assessment.getQuestionReferences()) {
+	    hasRandomQuestion |= reference.isRandomQuestion();
+	}
+	// in case there is at least one random question - we need to show all questions
+	if (hasRandomQuestion) {
+	    questions.addAll(assessment.getQuestions());
+
+	// show only questions from question list otherwise
+	} else {
+	    for (QuestionReference reference : (Set<QuestionReference>) assessment.getQuestionReferences()) {
+		//sort questions the same way references are sorted (as per LKC request)
+		AssessmentQuestion question = reference.getQuestion();
+		question.setSequenceId(reference.getSequenceId());
+		questions.add(question);
+	    }
+	}
+	return questions;
+   }
+
+    /**
+     * Shows aes page
+     */
+    public ActionForward aes(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	initAssessmentService();
+
+	String[] toolContentIds = request.getParameter("assessmentToolContentIds").split(",");
+	String[] activityTitles = request.getParameter("assessmentActivityTitles").split("\\,");
+
+	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 mapping.findForward("assessment");
+    }
+
+    /**
+     * Shows ira StudentChoices page
+     */
+    public ActionForward aesStudentChoices(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	initAssessmentService();
+
+	Long toolContentId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
+	Assessment assessment = assessmentService.getAssessmentByContentId(toolContentId);
+	Map<Long, QuestionSummary> questionSummaries = assessmentService.getQuestionSummaryForExport(assessment);
+	List<TblAssessmentQuestionDTO> tblQuestionDtos = new ArrayList<TblAssessmentQuestionDTO>();
+	for (QuestionSummary questionSummary : questionSummaries.values()) {
+	    AssessmentQuestion question = questionSummary.getQuestion();
+
+	    TblAssessmentQuestionDTO tblQuestionDto = new TblAssessmentQuestionDTO();
+	    tblQuestionDto.setQuestion(question);
+	    tblQuestionDto.setQuestionTypeLabel(TblMonitoringAction.getAssessmentQuestionTypeLabel(question.getType()));
+	    tblQuestionDto.setCorrectAnswer(getAssessmentCorrectAnswer(question));
+
+	    List<TblAssessmentQuestionResultDTO> sessionQuestionResults = new ArrayList<TblAssessmentQuestionResultDTO>();
+	    for (List<AssessmentQuestionResult> questionResultsPerSession : questionSummary
+		    .getQuestionResultsPerSession()) {
+
+		TblAssessmentQuestionResultDTO tblQuestionResultDto = new TblAssessmentQuestionResultDTO();
+		String answer = "";
+		boolean correct = false;
+		if (!questionResultsPerSession.isEmpty()) {
+		    AssessmentQuestionResult questionResult = questionResultsPerSession.get(0);
+		    answer = AssessmentEscapeUtils.printResponsesForJqgrid(questionResult);
+		    correct = questionResult.getMaxMark() == null ? false
+			    : (questionResult.getPenalty() + questionResult.getMark() + 0.1) >= questionResult
+				    .getMaxMark();
+		}
+		tblQuestionResultDto.setAnswer(answer);
+		tblQuestionResultDto.setCorrect(correct);
+
+		sessionQuestionResults.add(tblQuestionResultDto);
+	    }
+	    tblQuestionDto.setSessionQuestionResults(sessionQuestionResults);
+
+	    tblQuestionDtos.add(tblQuestionDto);
+	}
+
+	SortedSet<AssessmentSession> sessions = new TreeSet<AssessmentSession>(new AssessmentSessionComparator());
+	sessions.addAll(assessmentService.getSessionsByContentId(assessment.getContentId()));
+
+	request.setAttribute("sessions", sessions);
+	request.setAttribute("questionDtos", tblQuestionDtos);
+	request.setAttribute(AttributeNames.PARAM_TOOL_CONTENT_ID, toolContentId);
+	return mapping.findForward("assessmentStudentChoices");
+    }
+
+    /**
+     * Used only for excell export (for getUserSummaryData() method).
+     */
+    private static String getAssessmentQuestionTypeLabel(short type) {
+	switch (type) {
+	    case AssessmentConstants.QUESTION_TYPE_ESSAY:
+		return "Essay";
+	    case AssessmentConstants.QUESTION_TYPE_MATCHING_PAIRS:
+		return "Matching Pairs";
+	    case AssessmentConstants.QUESTION_TYPE_MULTIPLE_CHOICE:
+		return "Multiple Choice";
+	    case AssessmentConstants.QUESTION_TYPE_NUMERICAL:
+		return "Numerical";
+	    case AssessmentConstants.QUESTION_TYPE_ORDERING:
+		return "Ordering";
+	    case AssessmentConstants.QUESTION_TYPE_SHORT_ANSWER:
+		return "Short Answer";
+	    case AssessmentConstants.QUESTION_TYPE_TRUE_FALSE:
+		return "True/False";
+	    case AssessmentConstants.QUESTION_TYPE_MARK_HEDGING:
+		return "Mark Hedging";
+	    default:
+		return null;
+	}
+    }
+
+    /**
+     * Used only for excell export (for getUserSummaryData() method).
+     */
+    private String getAssessmentCorrectAnswer(AssessmentQuestion question) {
+	StringBuilder sb = new StringBuilder();
+
+	if (question != null) {
+	    switch (question.getType()) {
+		case AssessmentConstants.QUESTION_TYPE_ESSAY:
+		    return "N.A.";
+
+		case AssessmentConstants.QUESTION_TYPE_MATCHING_PAIRS:
+		    for (AssessmentQuestionOption option : question.getOptions()) {
+			sb.append((option.getQuestion() + " - " + option.getOptionString()).replaceAll("\\<.*?\\>", "")
+				+ " <br>");
+		    }
+		    return sb.toString();
+
+		case AssessmentConstants.QUESTION_TYPE_MULTIPLE_CHOICE:
+		case AssessmentConstants.QUESTION_TYPE_SHORT_ANSWER:
+		    for (AssessmentQuestionOption option : question.getOptions()) {
+			if (option.getGrade() == 1f) {
+			    return option.getOptionString();
+			}
+		    }
+		    break;
+
+		case AssessmentConstants.QUESTION_TYPE_NUMERICAL:
+		    for (AssessmentQuestionOption option : question.getOptions()) {
+			if (option.getGrade() == 1f) {
+			    return "" + option.getOptionFloat();
+			}
+		    }
+		    break;
+
+		case AssessmentConstants.QUESTION_TYPE_ORDERING:
+		    TreeSet<AssessmentQuestionOption> correctOptionSet = new TreeSet<AssessmentQuestionOption>(
+			    new SequencableComparator());
+		    correctOptionSet.addAll(question.getOptions());
+
+		    for (AssessmentQuestionOption option : question.getOptions()) {
+			sb.append(option.getOptionString() + "\n");
+		    }
+		    return sb.toString();
+
+		case AssessmentConstants.QUESTION_TYPE_TRUE_FALSE:
+		    return new Boolean(question.getCorrectAnswer()).toString();
+
+		case AssessmentConstants.QUESTION_TYPE_MARK_HEDGING:
+		    for (AssessmentQuestionOption option : question.getOptions()) {
+			if (option.isCorrect()) {
+			    return option.getOptionString();
+			}
+		    }
+		    break;
+
+		default:
+		    return null;
+	    }
+	}
+
+	return null;
+    }
+
+//    /**
+//     * Excel Summary Export.
+//     *
+//     * @param mapping
+//     * @param form
+//     * @param request
+//     * @param response
+//     * @return
+//     * @throws IOException
+//     */
+//    public ActionForward exportExcelAssessment(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+//	    HttpServletResponse response) throws IOException, ServletException {
+//	initAssessmentService();
+//
+//	Long toolContentId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
+//	Assessment assessment = assessmentService.getAssessmentByContentId(toolContentId);
+//
+//	List<SessionDTO> sessionDtos = assessmentService.getSessionDtos(toolContentId, false);
+//	boolean showUserNames = true;
+//	LinkedHashMap<String, ExcelCell[][]> dataToExport = assessmentService.exportSummary(assessment, sessionDtos,
+//		showUserNames);
+//
+//	response.setContentType("application/x-download");
+//	String fileName = "assessment_" + assessment.getUid() + "_export.xlsx";
+//	response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
+//	log.debug("Exporting assessment to a spreadsheet: " + assessment.getContentId());
+//
+//	ServletOutputStream out = response.getOutputStream();
+//	ExcelUtil.createExcel(out, dataToExport, "Exported on", true);
+//
+//	return null;
+//    }
+    
+    /**
+     * Get ModalDialog for Teams tab.
+     * 
+     * @throws JSONException
+     * @throws IOException
+     */
+    public ActionForward getModalDialogForTeamsTab(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws JSONException, IOException {
+	initAssessmentService();
+	long toolContentId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
+	Long userId = WebUtil.readLongParam(request, AttributeNames.PARAM_USER_ID);
+	
+	AssessmentUser user = assessmentService.getUserByIdAndContent(userId, toolContentId);
+	AssessmentResultDTO result = assessmentService.getUserMasterDetail(user.getSession().getSessionId(), userId);
+	request.setAttribute(AssessmentConstants.ATTR_ASSESSMENT_RESULT, result);
+	
+	
+//	// release object from the cache (it's required when we have modified result object in the same request)
+//	AssessmentResult result = assessmentService.getLastFinishedAssessmentResultNotFromChache(assessment.getUid(), userId);
+//
+//	for (Set<QuestionDTO> questionsForOnePage : pagedQuestionDtos) {
+//	    for (QuestionDTO questionDto : questionsForOnePage) {
+//
+//		// find corresponding questionResult
+//		for (AssessmentQuestionResult questionResult : result.getQuestionResults()) {
+//		    if (questionDto.getUid().equals(questionResult.getAssessmentQuestion().getUid())) {
+//
+//			// copy questionResult's info to the question
+//			questionDto.setResponseSubmitted(questionResult.getFinishDate() != null);
+//
+//			// required for showing right/wrong answers icons on results page correctly
+//			if (questionDto.getType() == AssessmentConstants.QUESTION_TYPE_SHORT_ANSWER
+//				|| questionDto.getType() == AssessmentConstants.QUESTION_TYPE_NUMERICAL) {
+//			    boolean isAnsweredCorrectly = false;
+//			    for (OptionDTO optionDto : questionDto.getOptionDtos()) {
+//				if (optionDto.getUid().equals(questionResult.getSubmittedOptionUid())) {
+//				    isAnsweredCorrectly = optionDto.getGrade() > 0;
+//				    break;
+//				}
+//			    }
+//			    questionDto.setAnswerBoolean(isAnsweredCorrectly);
+//			}
+//
+//			// required for markandpenalty area and if it's on - on question's summary page
+//			List<Object[]> questionResults = assessmentService.getAssessmentQuestionResultList(assessment.getUid(),
+//				userId, questionDto.getUid());
+//			questionDto.setQuestionResults(questionResults);
+//		    }
+//		}
+//	    }
+//	}
+	
+	return mapping.findForward("teams");
+    }
+
+//  /**
+//   * Used only for excell export (for getUserSummaryData() method).
+//   */
+//  private static TBLAssessmentQuestionResult getAssessmentTBLQuestionResult(AssessmentQuestionResult questionResult) {
+//	AssessmentQuestion question = questionResult.getAssessmentQuestion();
+//	String answer = "";
+//
+//	switch (question.getType()) {
+//	case AssessmentConstants.QUESTION_TYPE_ESSAY:
+//	    answer = questionResult.getAnswerString();
+//
+//	case AssessmentConstants.QUESTION_TYPE_MATCHING_PAIRS:
+//	    for (AssessmentQuestionOption option : question.getOptions()) {
+//		sb.append("[" + option.getQuestion() + ", " + option.getOptionString() + "] \n");
+//	    }
+//	    return sb.toString();
+//
+//	case AssessmentConstants.QUESTION_TYPE_MULTIPLE_CHOICE:
+//	    for (AssessmentQuestionOption option : question.getOptions()) {
+//		if (option.getGrade() == 100f) {
+//		    return option.getOptionString();
+//		}
+//	    }
+//
+//	case AssessmentConstants.QUESTION_TYPE_NUMERICAL:
+//	    return question.getAnswerString();
+//
+//	case AssessmentConstants.QUESTION_TYPE_ORDERING:
+//	    TreeSet<AssessmentQuestionOption> correctOptionSet = new TreeSet<AssessmentQuestionOption>(
+//		    new SequencableComparator());
+//	    correctOptionSet.addAll(question.getOptions());
+//
+//	    for (AssessmentQuestionOption option : question.getOptions()) {
+//		sb.append(option.getOptionString() + "\n");
+//	    }
+//	    return sb.toString();
+//
+//	case AssessmentConstants.QUESTION_TYPE_SHORT_ANSWER:
+//	    return question.getAnswerString();
+//
+//	case AssessmentConstants.QUESTION_TYPE_TRUE_FALSE:
+//	    return new Boolean(question.getAnswerBoolean()).toString();
+//
+//	case AssessmentConstants.QUESTION_TYPE_MARK_HEDGING:
+//	    for (AssessmentQuestionOption option : question.getOptions()) {
+//		if (option.isCorrect()) {
+//		    return option.getOptionString();
+//		}
+//	    }
+//
+//	default:
+//	    return null;
+//	}
+//
+//	TBLAssessmentQuestionResult tblQuestionResult = new TBLAssessmentQuestionResult();
+//	String answer = AssessmentEscapeUtils.printResponsesForJqgrid(questionResult);
+//	tblQuestionResult.setAnswer(answer);
+//	boolean correct = (questionResult.getPenalty() + questionResult.getMark() + 0.1) >= questionResult.getMaxMark();
+//	tblQuestionResult.setCorrect(correct);
+//	return tblQuestionResult;
+//  }
+    
+    // *************************************************************************************
+    // Private method
+    // *************************************************************************************
+    private IAssessmentService initAssessmentService() {
+	if (assessmentService == null) {
+	    WebApplicationContext wac = WebApplicationContextUtils
+		    .getRequiredWebApplicationContext(getServlet().getServletContext());
+	    assessmentService = (IAssessmentService) wac.getBean(AssessmentConstants.ASSESSMENT_SERVICE);
+	}
+	return assessmentService;
+    }
+
+}
Index: lams_tool_assessment/web/WEB-INF/struts-config.xml
===================================================================
diff -u -ra7b248d0864feae179f5ffdbec7b1881259f6a23 -r5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d
--- lams_tool_assessment/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision a7b248d0864feae179f5ffdbec7b1881259f6a23)
+++ lams_tool_assessment/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -357,7 +357,31 @@
 			type="org.lamsfoundation.lams.tool.assessment.web.action.MonitoringAction"
 			parameter="statistic" >
 			<forward name="success" path="/pages/monitoring/statisticpart.jsp" />
-		</action>			
+		</action>
+		
+		<!--TBL Monitoring Action -->
+   		<action 	path="/tblmonitoring" 
+   			type="org.lamsfoundation.lams.tool.assessment.web.action.TblMonitoringAction"
+	      	scope="request"
+      		parameter="method"
+      		unknown="false"
+      		validate="false"> 
+		  	<forward
+				name="assessment"
+				path="/pages/tblmonitoring/assessment.jsp"
+				redirect="false"
+		  	/>
+		  	<forward
+			    name="assessmentStudentChoices"
+			    path="/pages/tblmonitoring/assessmentStudentChoices.jsp"
+			    redirect="false"
+		  	/>
+		  	<forward
+			    name="teams"
+			    path="/pages/tblmonitoring/teams.jsp"
+			    redirect="false"
+		  	/>
+		</action>
 		<!-- ========== Common Definitions ============================== -->
 		<action path="/clearsession"
 			type="org.lamsfoundation.lams.tool.assessment.web.action.ClearSessionAction">
Index: lams_tool_assessment/web/WEB-INF/web.xml
===================================================================
diff -u -r2a70ed7d169b7c8fe70237c266eb6194f3392164 -r5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d
--- lams_tool_assessment/web/WEB-INF/web.xml	(.../web.xml)	(revision 2a70ed7d169b7c8fe70237c266eb6194f3392164)
+++ lams_tool_assessment/web/WEB-INF/web.xml	(.../web.xml)	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -248,6 +248,21 @@
 			<role-name>SYSADMIN</role-name>
 		</auth-constraint>
 	</security-constraint>
+	<security-constraint>
+		<web-resource-collection>
+			<web-resource-name>TBL Monitor interface</web-resource-name>
+			<url-pattern>/tblmonitoring.do</url-pattern>
+			<http-method>GET</http-method>
+ 			<http-method>POST</http-method>
+		</web-resource-collection>
+		<auth-constraint>
+			<!-- Author can preview the lesson -->
+			<role-name>MONITOR</role-name>
+			<role-name>GROUP ADMIN</role-name>
+			<role-name>GROUP MANAGER</role-name>
+			<role-name>SYSADMIN</role-name>
+		</auth-constraint>
+	</security-constraint>
 
 	<!-- Security Roles -->
 	<security-role>
Index: lams_tool_assessment/web/common/taglibs.jsp
===================================================================
diff -u -r9d26aaf34391eb58df037978365deda31de85c1b -r5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d
--- lams_tool_assessment/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision 9d26aaf34391eb58df037978365deda31de85c1b)
+++ lams_tool_assessment/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -7,4 +7,5 @@
 <%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ taglib uri="tags-xml" prefix="x" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
-
+<c:set var="ALPHABET" value="${fn:split('a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z', ',')}" scope="request"/>
+<c:set var="ALPHABET_CAPITAL_LETTERS" value="${fn:split('A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z', ',')}" scope="request"/>
Index: lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp
===================================================================
diff -u
--- lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp	(revision 0)
+++ lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -0,0 +1,193 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<script>
+	$(document).ready(function(){
+		// change attempted and all learners numbers
+		$('.nav-tabs').bind('click', function (event) {
+			
+			var link = $(event.target);
+			var attemptedLearnersNumber = link.data("attempted-learners-number");
+			$("#attempted-learners-number").html(attemptedLearnersNumber);
+
+			var toolContentId = link.data("tool-content-id");
+			$("#selected-content-id").val(toolContentId);
+		});
+
+		//insert total learners number taken from the parent tblmonitor.jsp
+		$("#total-learners-number").html(TOTAL_LESSON_LEARNERS_NUMBER);
+	});
+</script>
+
+<!-- Header -->
+<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>
+		</h3>
+	</div>
+</div>
+<!-- End header -->    
+
+<!-- Notifications -->  
+<div class="row no-gutter">
+	<div class="col-xs-6 col-md-4 col-lg-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 id="attempted-learners-number">${assessmentDtos[0].attemptedLearnersNumber}</span>/<span id="total-learners-number"></span> 
+				</h4> 
+			</div>
+		</div>
+	</div>
+
+	<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('aesStudentChoices', document.getElementById('selected-content-id').value, ${isIraAssessment}); return false;">
+			<i class="fa fa-file"></i>
+			<fmt:message key="label.show.students.choices"/>
+		</a>
+	</div>                                  
+</div>
+
+<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 -->
+
+<!-- Tables -->
+<div class="tab-content">
+	<c:forEach var="assessmentDto" items="${assessmentDtos}" varStatus="k">
+		<div id="assessment-${assessmentDto.assessment.uid}" class="tab-pane 
+			<c:if test="${(k.index == 0 && toolContentID == null) || (toolContentID != null && assessmentDto.assessment.contentId == toolContentID)}">active</c:if>">
+			<c:forEach var="question" items="${assessmentDto.questions}" varStatus="i">
+				<div class="row no-gutter">
+				<div class="col-xs-12 col-md-12 col-lg-10">
+				<div class="panel panel-default">
+					<div class="panel-heading">
+						<h4 class="panel-title">
+							<span class="float-left space-right">Q${i.index+1})</span> <c:out value="${question.title}" escapeXml="false"/>
+						</h4> 
+					</div>
+					
+					<div class="panel-body">
+						<div class="table-responsive">	
+							<c:out value="${question.question}" escapeXml="false"/>
+							
+							<table class="table table-striped">
+								<tbody>
+									
+									<c:choose>
+										<c:when test="${question.type == 1}">
+											<c:forEach var="questionOption" items="${question.options}" varStatus="j">
+													
+												<tr>
+													<td width="5px">
+														${ALPHABET[j.index]}.
+													</td>									
+													<td>
+														<c:out value="${questionOption.optionString}" escapeXml="false"/>
+													</td>
+												</tr>
+																		
+											</c:forEach>						
+										</c:when>
+										
+										<c:when test="${question.type == 2}">
+											<tr style="background: none;">
+												<td style="border-top: none;">
+												</td>
+																
+												<td style="border-top: none; font-weight: bold;">
+													Possible answers
+												</td>
+											</tr>
+										
+											<c:forEach var="questionOption" items="${question.options}" varStatus="j">
+												<tr>
+													<td>
+														<span class="pull-left">${ALPHABET[j.index]}.</span>
+																
+														<c:out value="${questionOption.question}" escapeXml="false"/>
+													</td>
+																
+													<td>
+														<c:out value="${questionOption.optionString}" escapeXml="false"/>
+													</td>
+												</tr>
+											</c:forEach>
+										</c:when>
+										
+										<c:when test="${(question.type == 3) || (question.type == 4) || (question.type == 6)}">
+										</c:when>
+															
+										<c:when test="${question.type == 5}">
+											<tr>
+												<td width="5px">
+													a.
+												</td>
+												<td>
+													<fmt:message key="label.learning.true.false.true"/>
+												</td>
+											</tr>
+											<tr>
+												<td width="5px">
+													b.
+												</td>								
+												<td>
+													<fmt:message key="label.learning.true.false.false"/>
+												</td>
+											</tr>
+										</c:when>
+															
+										<c:when test="${(question.type == 7) || (question.type == 8)}">
+											<c:forEach var="questionOption" items="${question.options}" varStatus="j">
+															
+												<tr>
+													<td width="5px">
+														${ALPHABET[j.index]}.
+													</td>
+													<td>
+														<c:out value="${questionOption.optionString}" escapeXml="false"/>
+													</td>
+												</tr>
+												
+											</c:forEach>
+										</c:when>						
+										
+									</c:choose>
+								</tbody>
+							</table>
+						</div>
+					</div>
+				</div>  
+				</div>
+				</div>
+			</c:forEach>
+		</div>
+	</c:forEach>
+</div>
+<!-- End tables -->
Index: lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp
===================================================================
diff -u
--- lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp	(revision 0)
+++ lams_tool_assessment/web/pages/tblmonitoring/assessmentStudentChoices.jsp	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -0,0 +1,122 @@
+<%@ include file="/common/taglibs.jsp"%>
+<c:set var="method">
+	<c:choose>
+		<c:when test="${param.isIraAssessment}">
+			iraAssessment
+		</c:when>
+		<c:otherwise>
+			aes
+		</c:otherwise>
+	</c:choose>
+</c:set>
+
+<script>
+	function exportExcel(){
+		location.href = "<lams:LAMSURL/>tool/laasse10/monitoring/exportSummary.do?toolContentID=${toolContentID}&fileName=assessment_export&reqID=" + (new Date()).getTime();
+	};
+</script>
+
+<!-- Header -->
+<div class="row no-gutter">
+	<div class="col-xs-12 col-md-12 col-lg-8">
+		<h3>
+			<c:choose>
+				<c:when test="${param.isIraAssessment}">
+					<fmt:message key="label.ira.questions.marks"/>
+				</c:when>
+				<c:otherwise>
+					<fmt:message key="label.ae.questions.marks"/>
+				</c:otherwise>
+			</c:choose>
+		</h3>
+	</div>
+</div>
+<!-- End header -->
+
+<!-- Notifications -->
+<div class="row">
+	<div class="col-md-6 col-lg-4 ">
+	</div>
+	
+	<div class="col-xs-12 col-md-6 col-lg-4 col-lg-offset-2">
+		<a href="#nogo" type="button" class="btn btn-sm btn-default buttons_column"
+				onclick="javascript:loadTab('${method}', ${toolContentID}); return false;">
+			<i class="fa fa-undo"></i>
+			<fmt:message key="label.hide.students.choices"/>
+		</a>
+		<a href="#nogo" onclick="javascript:printTable(); return false;" type="button" class="btn btn-sm btn-default buttons_column">
+			<i class="fa fa-print"></i>
+			<fmt:message key="label.print"/>
+		</a>
+		<a href="#nogo" onclick="javascript:exportExcel(); return false;" type="button" class="btn btn-sm btn-default buttons_column">
+			<i class="fa fa-file"></i>
+			<fmt:message key="label.excel.export"/>
+		</a>
+	</div>
+</div>
+<br>
+<!-- End notifications -->
+
+<!-- Table --> 
+<div class="row no-gutter">
+<div class="col-xs-12 col-md-12 col-lg-10">
+<div class="panel">
+<div class="panel-body table-responsive">
+          
+	<table  id="questions-data" class="table table-responsive table-striped table-bordered table-hover table-condensed">
+		<thead>
+			<tr role="row">
+				<th></th>
+				<c:forEach var="questionDto" items="${questionDtos}" varStatus="i">
+					<th class="text-center">
+						<fmt:message key="label.authoring.basic.list.header.question"/> ${i.index + 1}
+					</th>
+				</c:forEach>
+			</tr>
+		</thead>
+		<tbody>
+		
+			<tr role="row">
+				<th><b>Question type</b></th>
+				<c:forEach var="questionDto" items="${questionDtos}" varStatus="i">
+					<td class="text-center">
+						${questionDto.questionTypeLabel}
+					</td>
+				</c:forEach>
+			</tr>
+		
+			<tr>
+				<td><b>Correct answer</b></td>
+				<c:forEach var="questionDto" items="${questionDtos}" varStatus="i">
+					<td class="text-center">
+						${questionDto.correctAnswer}
+					</td>
+				</c:forEach>
+			</tr>
+			
+			<tr>
+				<td colspan="${fn:length(questionDtos) + 1}" style="font-weight: bold;"><fmt:message key="label.teams"/></td> 
+			</tr>
+			
+			<c:forEach var="session" items="${sessions}" varStatus="i">
+				<tr>
+					<td class="text-center">
+						${session.sessionName}
+					</td>
+					
+					<c:forEach var="questionDto" items="${questionDtos}" varStatus="j">
+						<c:set var="questionResultDto" value="${questionDto.sessionQuestionResults[i.index]}"/>
+						<td class="text-center <c:if test="${questionResultDto.correct}">success</c:if>" >
+							${questionResultDto.answer}
+						</td>
+					</c:forEach>
+					
+				</tr>
+			</c:forEach>                                               
+		</tbody>
+	</table>
+</div>
+</div>
+</div>          
+</div>
+
Index: lams_tool_assessment/web/pages/tblmonitoring/teams.jsp
===================================================================
diff -u
--- lams_tool_assessment/web/pages/tblmonitoring/teams.jsp	(revision 0)
+++ lams_tool_assessment/web/pages/tblmonitoring/teams.jsp	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -0,0 +1,37 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<c:forEach var="questionResult" items="${assessmentResult.questionResults}" varStatus="i">
+	<c:set var="question" value="${questionResult.assessmentQuestion}"/>
+	
+	<div class="panel panel-default">
+		<div class="panel-heading">
+			<h4 class="panel-title">
+				<span class="float-left space-right">Q${i.index+1})</span> 
+				<c:out value="${questionResult.assessmentQuestion.title}" escapeXml="false"/>
+			</h4> 
+		</div>
+	              
+		<div class="panel-body">
+			<div class="table-responsive">
+				<table class="table table-striped">
+					<tbody>
+						<tr>
+							<td>
+								<%@ include file="userresponse.jsp"%>
+												
+								<!--<c:choose>
+									<c:when test="${userAttempt.mcOptionsContent.correctOption}">
+										<i class="fa fa-check-square"></i>
+									</c:when>
+									<c:otherwise>
+										<i class="fa fa-minus-square"></i>
+									</c:otherwise>
+								</c:choose>-->
+							</td>
+						</tr>
+					</tbody>
+				</table>
+			</div>
+		</div>
+	</div>
+</c:forEach>
Index: lams_tool_assessment/web/pages/tblmonitoring/userresponse.jsp
===================================================================
diff -u
--- lams_tool_assessment/web/pages/tblmonitoring/userresponse.jsp	(revision 0)
+++ lams_tool_assessment/web/pages/tblmonitoring/userresponse.jsp	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -0,0 +1,92 @@
+<%@ include file="/common/taglibs.jsp"%>					
+					
+<c:choose>
+	<c:when test="${question.type == 1}">
+		<c:forEach var="option" items="${question.options}">
+			<c:forEach var="optionAnswer" items="${questionResult.optionAnswers}">
+				<c:if test="${optionAnswer.answerBoolean && (optionAnswer.optionUid == option.uid)}">
+					${option.optionString}
+				</c:if>
+			</c:forEach>					
+		</c:forEach>						
+	</c:when>
+						
+	<c:when test="${question.type == 2}">
+		<c:forEach var="option" items="${question.options}">
+			<div>
+				<div style="float: left;">
+					${option.question}
+				</div>
+				<div style=" float: right; width: 50%;">
+								 - 
+					<c:forEach var="optionAnswer" items="${questionResult.optionAnswers}">
+						<c:if test="${option.uid == optionAnswer.optionUid}">
+							<c:forEach var="questionOption2" items="${question.options}">
+								<c:if test="${questionOption2.uid == optionAnswer.answerInt}">
+									${questionOption2.optionString}
+								</c:if>
+							</c:forEach>
+						</c:if>
+					</c:forEach>										
+				</div>
+			</div>
+			<br>
+		</c:forEach>
+	</c:when>
+						
+	<c:when test="${question.type == 3}">
+		${fn:escapeXml(questionResult.answerString)}
+	</c:when>
+						
+	<c:when test="${question.type == 4}">
+		${questionResult.answerString}
+	</c:when>
+						
+	<c:when test="${question.type == 5}">
+		<c:if test="${questionResult.answerString != null}">			
+			${questionResult.answerBoolean}
+		</c:if>
+	</c:when>
+						
+	<c:when test="${question.type == 6}">
+		${questionResult.answerString}
+	</c:when>
+						
+	<c:when test="${question.type == 7}">
+		<c:forEach var="j" begin="0" end="${fn:length(questionResult.optionAnswers) - 1}" step="1">
+			<c:forEach var="optionAnswer" items="${questionResult.optionAnswers}">
+				<c:if test="${optionAnswer.answerInt == j}">		
+					<c:forEach var="option" items="${question.options}">
+						<c:if test="${optionAnswer.optionUid == option.uid}">
+							${option.optionString}
+						</c:if>
+					</c:forEach>
+				</c:if>								
+			</c:forEach>
+		</c:forEach>
+	</c:when>
+						
+	<c:when test="${question.type == 8}">
+		<c:forEach var="option" items="${question.options}">
+			<div>';
+				<div style="float: left;">
+					${option.optionString}
+				</div>
+				<div style=" float: right; width: 20%;">
+					- 
+					<c:forEach var="optionAnswer" items="${questionResult.optionAnswers}">
+						<c:if test="${option.uid == optionAnswer.optionUid}">
+							${optionAnswer.answerInt}
+						</c:if>
+					</c:forEach>										
+				</div>
+			</div>
+			<br>
+		</c:forEach>
+							
+	<c:if test="${question.hedgingJustificationEnabled}">
+		${questionResult.answerString}
+	</c:if>
+	</c:when>						
+	
+</c:choose>
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java
===================================================================
diff -u -r3c88fe83de7aaf7bd9dbe9ea6e1cb0e43d099ffa -r5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java	(.../IMcUserDAO.java)	(revision 3c88fe83de7aaf7bd9dbe9ea6e1cb0e43d099ffa)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java	(.../IMcUserDAO.java)	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -47,6 +47,8 @@
      * @return the persistent instance of a McQueUsr or null if not found
      */
     McQueUsr getMcUserByUID(Long uid);
+    
+    McQueUsr getMcUserByContentId(Long userId, Long contentId);
 
     McQueUsr getMcUserBySession(Long userId, Long sessionUid);
     
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java
===================================================================
diff -u -r3c88fe83de7aaf7bd9dbe9ea6e1cb0e43d099ffa -r5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java	(.../McUserDAO.java)	(revision 3c88fe83de7aaf7bd9dbe9ea6e1cb0e43d099ffa)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java	(.../McUserDAO.java)	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -72,6 +72,15 @@
     public McQueUsr getMcUserByUID(Long uid) {
 	return (McQueUsr) this.getSession().get(McQueUsr.class, uid);
     }
+    
+    @Override
+    public McQueUsr getMcUserByContentId(Long userId, Long contentId) {
+	final String GET_USER_BY_USER_ID_AND_CONTENT_ID = "from " + McQueUsr.class.getName()
+		+ " user where user.queUsrId=:userId and user.mcSession.mcContent.mcContentId=:contentId";
+	
+	return (McQueUsr) getSessionFactory().getCurrentSession().createQuery(GET_USER_BY_USER_ID_AND_CONTENT_ID)
+	.setLong("userId", userId).setLong("contentId", contentId).uniqueResult();
+    }
 
     @SuppressWarnings("rawtypes")
     @Override
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java
===================================================================
diff -u -rb6b28d32fe5b2923cbb30a6c9b889c02e1ba29cf -r5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java	(.../IMcService.java)	(revision b6b28d32fe5b2923cbb30a6c9b889c02e1ba29cf)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java	(.../IMcService.java)	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -89,6 +89,14 @@
     void saveUserAttempt(McQueUsr user, List<AnswerDTO> answerDtos);
 
     void updateMcUsrAttempt(McUsrAttempt mcUsrAttempt) throws McApplicationException;
+    
+    /**
+     * Count how many attempts done to this option
+     *
+     * @param optionUid
+     * @return
+     */
+    int getAttemptsCountPerOption(Long optionUid);
 
     void removeMcQueContent(McQueContent mcQueContent) throws McApplicationException;
 
@@ -108,6 +116,8 @@
     McQueContent getQuestionByUid(Long uid);
 
     McQueUsr getMcUserByUID(Long uid) throws McApplicationException;
+    
+    McQueUsr getMcUserByContentId(Long userId, Long contentId);
 
     List<McUserMarkDTO> getPagedUsersBySession(Long sessionId, int page, int size, String sortBy, String sortOrder,
 	    String searchString);
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
===================================================================
diff -u -r5e36aad06f5b9c4fe8551ddc8af5a734ba8058bf -r5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java	(.../McService.java)	(revision 5e36aad06f5b9c4fe8551ddc8af5a734ba8058bf)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java	(.../McService.java)	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -377,14 +377,14 @@
     }
 
     @Override
-    public McQueUsr getMcUserByUID(Long uid) throws McApplicationException {
-	try {
-	    return mcUserDAO.getMcUserByUID(uid);
-	} catch (DataAccessException e) {
-	    throw new McApplicationException(
-		    "Exception occured when lams is getting the mc QueUsr by uid." + e.getMessage(), e);
-	}
+    public McQueUsr getMcUserByUID(Long uid) {
+	return mcUserDAO.getMcUserByUID(uid);
     }
+    
+    @Override
+    public McQueUsr getMcUserByContentId(Long userId, Long contentId) {
+	return mcUserDAO.getMcUserByContentId(userId, contentId);
+    }
 
     @Override
     public Long getPortraitId(Long userId) {
@@ -473,6 +473,11 @@
 		    e);
 	}
     }
+    
+    @Override
+    public int getAttemptsCountPerOption(Long optionUid) {
+	return mcUsrAttemptDAO.getAttemptsCountPerOption(optionUid);
+    }
 
     @Override
     public List<AnswerDTO> getAnswersFromDatabase(McContent mcContent, McQueUsr user) {
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/TblMonitoringAction.java
===================================================================
diff -u
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/TblMonitoringAction.java	(revision 0)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/TblMonitoringAction.java	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -0,0 +1,135 @@
+package org.lamsfoundation.lams.tool.mc.web.action;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.log4j.Logger;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.tomcat.util.json.JSONException;
+import org.lamsfoundation.lams.tool.mc.dto.McOptionDTO;
+import org.lamsfoundation.lams.tool.mc.dto.McQuestionDTO;
+import org.lamsfoundation.lams.tool.mc.pojos.McContent;
+import org.lamsfoundation.lams.tool.mc.pojos.McOptsContent;
+import org.lamsfoundation.lams.tool.mc.pojos.McQueContent;
+import org.lamsfoundation.lams.tool.mc.pojos.McQueUsr;
+import org.lamsfoundation.lams.tool.mc.pojos.McSession;
+import org.lamsfoundation.lams.tool.mc.pojos.McUsrAttempt;
+import org.lamsfoundation.lams.tool.mc.service.IMcService;
+import org.lamsfoundation.lams.tool.mc.service.McServiceProxy;
+import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.action.LamsDispatchAction;
+import org.lamsfoundation.lams.web.util.AttributeNames;
+
+public class TblMonitoringAction extends LamsDispatchAction {
+    private static Logger logger = Logger.getLogger(TblMonitoringAction.class.getName());
+
+    /**
+     * Shows iRA page in case of MCQ activity
+     */
+    public ActionForward iraMcq(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	IMcService mcService = McServiceProxy.getMcService(getServlet().getServletContext());
+	
+	long toolContentId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
+	McContent mcContent = mcService.getMcContent(toolContentId);
+	
+	int attemptedLearnersNumber = 0;
+	for (McSession session : (Set<McSession>) mcContent.getMcSessions()) {
+	    attemptedLearnersNumber += session.getMcQueUsers().size();
+	}
+	request.setAttribute("attemptedLearnersNumber", attemptedLearnersNumber);
+
+	request.setAttribute("questions", mcContent.getMcQueContents());
+	return mapping.findForward("mcq");
+    }
+
+    /**
+     * Shows ira StudentChoices page
+     */
+    public ActionForward mcqStudentChoices(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	IMcService mcService = McServiceProxy.getMcService(getServlet().getServletContext());
+	
+	long toolContentId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
+	McContent mcContent = mcService.getMcContent(toolContentId);
+
+	// ======================================================= Report by question IRA page
+	// =======================================
+
+	Set<McQueContent> questions = mcContent.getMcQueContents();
+	int maxOptionsInQuestion = 0;
+	for (McQueContent question : questions) {
+	    if (question.getMcOptionsContents().size() > maxOptionsInQuestion) {
+		maxOptionsInQuestion = question.getMcOptionsContents().size();
+	    }
+	}
+	request.setAttribute("maxOptionsInQuestion", maxOptionsInQuestion);
+
+	int totalNumberOfUsers = 0;
+	for (McSession session : (Set<McSession>) mcContent.getMcSessions()) {
+	    totalNumberOfUsers += session.getMcQueUsers().size();
+	}
+
+	ArrayList<McQuestionDTO> questionDtos = new ArrayList<McQuestionDTO>();
+	for (McQueContent question : questions) {
+
+	    // build candidate dtos
+	    List<McOptionDTO> optionDtos = new LinkedList<McOptionDTO>();
+	    Long totalPercentage = 0L;
+	    for (McOptsContent option : (Set<McOptsContent>) question.getMcOptionsContents()) {
+		int optionAttemptCount = mcService.getAttemptsCountPerOption(option.getUid());
+
+		Long percentage = (long) ((optionAttemptCount * 100) / totalNumberOfUsers);
+		totalPercentage += percentage;
+
+		McOptionDTO optionDTO = new McOptionDTO(option);
+//		optionDTO.setCandidateAnswer(StringEscapeUtils.escapeJavaScript(option.getMcQueOptionText()));
+		optionDTO.setUid(percentage);
+		optionDtos.add(optionDTO);
+	    }
+
+	    McQuestionDTO questionDto = new McQuestionDTO();
+	    questionDto.setUid(question.getUid());
+	    questionDto.setQuestion(question.getQuestion());
+//	    questionDto.setFeedback(StringEscapeUtils.escapeJavaScript(question.getQuestion()));
+	    questionDto.setMark("" + (100 - totalPercentage));
+	    questionDto.setOptionDtos(optionDtos);
+
+	    questionDtos.add(questionDto);
+	}
+	request.setAttribute("questionDtos", questionDtos);
+
+	request.setAttribute("questions", questions);
+	request.setAttribute(AttributeNames.PARAM_TOOL_CONTENT_ID, toolContentId);
+	return mapping.findForward("mcqStudentChoices");
+    }
+
+    /**
+     * Get ModalDialog for Teams tab.
+     * 
+     * @throws JSONException
+     */
+    public ActionForward getModalDialogForTeamsTab(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException {
+	IMcService mcService = McServiceProxy.getMcService(getServlet().getServletContext());
+	long toolContentId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
+	Long userId = WebUtil.readLongParam(request, AttributeNames.PARAM_USER_ID);
+	
+	McQueUsr user = mcService.getMcUserByContentId(userId, toolContentId);
+	List<McUsrAttempt> finalizedUserAttempts = user == null ? new LinkedList<McUsrAttempt>()
+		: mcService.getFinalizedUserAttempts(user);
+	request.setAttribute("userAttempts", finalizedUserAttempts);
+	
+	return mapping.findForward("teams");
+    }
+
+}
Index: lams_tool_lamc/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r4170df8bc66e658ef4dcd47e99eceddec3c2673a -r5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d
--- lams_tool_lamc/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 4170df8bc66e658ef4dcd47e99eceddec3c2673a)
+++ lams_tool_lamc/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -303,6 +303,30 @@
 	  	
 	</action>  
 	
+   <!--TBL Monitoring Action -->
+   <action 	path="/tblmonitoring" 
+   			type="org.lamsfoundation.lams.tool.mc.web.action.TblMonitoringAction"
+	      	scope="request"
+      		parameter="method"
+      		unknown="false"
+      		validate="false"> 
+	  	<forward
+			name="mcq"
+			path="/tblmonitoring/mcq.jsp"
+			redirect="false"
+	  	/>
+	  	<forward
+		    name="mcqStudentChoices"
+		    path="/tblmonitoring/mcqStudentChoices.jsp"
+		    redirect="false"
+	  	/>
+	  	<forward
+		    name="teams"
+		    path="/tblmonitoring/teams.jsp"
+		    redirect="false"
+	  	/>
+	</action> 
+	
    <action 	path="/clearsession" 
    			type="org.lamsfoundation.lams.tool.mc.web.action.ClearSessionAction"> 
 	</action>    
Index: lams_tool_lamc/web/WEB-INF/web.xml
===================================================================
diff -u -r2a70ed7d169b7c8fe70237c266eb6194f3392164 -r5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d
--- lams_tool_lamc/web/WEB-INF/web.xml	(.../web.xml)	(revision 2a70ed7d169b7c8fe70237c266eb6194f3392164)
+++ lams_tool_lamc/web/WEB-INF/web.xml	(.../web.xml)	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -290,6 +290,21 @@
 			<role-name>SYSADMIN</role-name>
 		</auth-constraint>
 	</security-constraint>
+	<security-constraint>
+		<web-resource-collection>
+			<web-resource-name>TBL Monitor interface</web-resource-name>
+			<url-pattern>/tblmonitoring.do</url-pattern>
+			<http-method>GET</http-method>
+ 			<http-method>POST</http-method>
+		</web-resource-collection>
+		<auth-constraint>
+			<!-- Author can preview the lesson -->
+			<role-name>MONITOR</role-name>
+			<role-name>GROUP ADMIN</role-name>
+			<role-name>GROUP MANAGER</role-name>
+			<role-name>SYSADMIN</role-name>
+		</auth-constraint>
+	</security-constraint>
 
 	<!-- Security Roles -->
 	<security-role>
Index: lams_tool_lamc/web/common/taglibs.jsp
===================================================================
diff -u -r9d26aaf34391eb58df037978365deda31de85c1b -r5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d
--- lams_tool_lamc/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision 9d26aaf34391eb58df037978365deda31de85c1b)
+++ lams_tool_lamc/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -8,4 +8,7 @@
 <%@ taglib uri="tags-xml" prefix="x" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
+<c:set var="ALPHABET" value="${fn:split('a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z', ',')}" scope="request"/>
+<c:set var="ALPHABET_CAPITAL_LETTERS" value="${fn:split('A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z', ',')}" scope="request"/>
 
+
Index: lams_tool_lamc/web/tblmonitoring/mcq.jsp
===================================================================
diff -u
--- lams_tool_lamc/web/tblmonitoring/mcq.jsp	(revision 0)
+++ lams_tool_lamc/web/tblmonitoring/mcq.jsp	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -0,0 +1,80 @@
+<%@ include file="/common/taglibs.jsp"%>
+<script>
+	$(document).ready(function(){
+		//insert total learners number taken from the parent tblmonitor.jsp
+		$("#total-learners-number").html(TOTAL_LESSON_LEARNERS_NUMBER);
+	});
+</script>
+
+<!-- Header -->
+<div class="row no-gutter">
+	<div class="col-xs-12 col-md-12 col-lg-8">
+		<h3>
+			<fmt:message key="label.ira.questions.marks"/>
+		</h3>
+	</div>
+</div>
+<!-- End header -->
+
+<!-- Notifications -->  
+<div class="row no-gutter">
+	<div class="col-xs-6 col-md-4 col-lg-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"/>: ${attemptedLearnersNumber}/<span id="total-learners-number"></span> 
+				</h4> 
+			</div>
+		</div>
+	</div>
+	
+	<c:if test="${attemptedLearnersNumber != 0}">
+		<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('mcqStudentChoices'); return false;">
+				<i class="fa fa-file"></i>
+				<fmt:message key="label.show.students.choices"/>
+			</a>
+		</div>
+	</c:if>                                   
+</div>
+<!-- End notifications -->
+
+<!-- Tables -->
+<div class="row no-gutter">
+<div class="col-xs-12 col-md-12 col-lg-10">
+
+<c:forEach var="question" items="${questions}" varStatus="i">
+	<div class="panel panel-default">
+		<div class="panel-heading">
+			<h4 class="panel-title">
+				<span class="float-left space-right">Q${i.index + 1})</span> <c:out value="${question.question}" escapeXml="false"/>
+			</h4>
+		</div>
+		
+		<div class="panel-body">
+			<div class="table-responsive">
+				<table class="table table-striped">
+					<tbody>
+						<c:forEach var="option" items="${question.mcOptionsContents}" varStatus="j">
+							<tr>
+								<td width="5px">
+									${ALPHABET[j.index]}.
+								</td>
+								<td>
+									<c:out value="${option.mcQueOptionText}" escapeXml="false"/>
+								</td>
+							</tr>
+						</c:forEach>
+					</tbody>
+				</table>
+			</div>
+		</div>
+	</div>
+</c:forEach>
+
+</div>
+</div>
+<!-- End tables -->
+
Index: lams_tool_lamc/web/tblmonitoring/mcqStudentChoices.jsp
===================================================================
diff -u
--- lams_tool_lamc/web/tblmonitoring/mcqStudentChoices.jsp	(revision 0)
+++ lams_tool_lamc/web/tblmonitoring/mcqStudentChoices.jsp	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -0,0 +1,156 @@
+<%@ include file="/common/taglibs.jsp"%>
+<script>
+	function exportExcel(){
+		location.href = "<lams:LAMSURL/>tool/lamc11/monitoring.do?dispatch=downloadMarks&downloadTokenValue=jjj&toolContentID=${toolContentID}&reqID=" + (new Date()).getTime();
+	};
+</script>
+
+<!-- Header -->
+<div class="row no-gutter">
+	<div class="col-xs-12 col-md-12 col-lg-8">
+		<h3>
+			<fmt:message key="label.ira.questions.marks"/>
+		</h3>
+	</div>
+</div>
+<!-- End header -->
+
+<!-- Notifications -->  
+<div class="row no-gutter">
+	<div class="col-md-6 col-lg-4 ">
+	</div>
+	
+	<div class="col-xs-12 col-md-6 col-lg-4 col-lg-offset-2">
+		<a href="#nogo" type="button" class="btn btn-sm btn-default buttons_column"
+				onclick="javascript:loadTab('iraMcq'); return false;">
+			<i class="fa fa-undo"></i>
+			<fmt:message key="label.hide.students.choices"/>
+		</a>
+		<a href="#nogo" onclick="javascript:printTable(); return false;" type="button" class="btn btn-sm btn-default buttons_column">
+			<i class="fa fa-print"></i>
+			<fmt:message key="label.print"/>
+		</a>
+		<a href="#nogo" onclick="javascript:exportExcel(); return false;" type="button" class="btn btn-sm btn-default buttons_column">
+			<i class="fa fa-file"></i>
+			<fmt:message key="label.excel.export"/>
+		</a>
+	</div>
+</div>
+<br>
+<!-- End notifications -->
+
+<!-- Table -->
+<div class="row no-gutter">
+<div class="col-xs-12 col-md-12 col-lg-10">
+<div class="panel">
+<div class="panel-body">
+<div class="table-responsive" style="margin:0">
+	<table id="questions-data" class="table table-striped table-bordered table-hover table-condensed">
+		<thead>
+			<tr role="row">
+				<th class="text-center">
+					<fmt:message key="label.question"/>
+				</th>
+				<c:forEach begin="0" end="${maxOptionsInQuestion - 1}" var="i">
+					<th class="text-center">
+						${ALPHABET_CAPITAL_LETTERS[i]}
+					</th>
+				</c:forEach>
+				<th class="text-center">
+					<fmt:message key="label.n.a"/>
+				</th>
+			</tr>
+		</thead>
+		
+		<tbody>
+			<c:forEach var="questionDto" items="${questionDtos}" varStatus="i">
+				<tr>
+					<td class="normal">
+						<a data-toggle="modal" href="#question${i.index}Modal">
+							${i.index+1}
+						</a>
+					</td>
+					
+					<c:forEach var="optionDto" items="${questionDto.optionDtos}">
+						<td class="normal <c:if test='${optionDto.correct == "Correct"}'>success</c:if>">
+							${optionDto.uid}%
+						</td>
+					</c:forEach>
+					
+					<c:forEach begin="1" end="${maxOptionsInQuestion - fn:length(questionDto.optionDtos)}" var="j">
+						<td class="normal"></td>
+					</c:forEach>
+					
+					<td class="normal">${questionDto.mark}%</td>
+				</tr>
+			</c:forEach>
+		</tbody>
+	</table>
+</div>
+</div>
+</div>          
+</div>
+</div>
+<!-- End table -->
+
+<!-- Question detail modal -->
+<c:forEach var="questionDto" items="${questionDtos}" varStatus="i">
+	<div class="modal fade" id="question${i.index}Modal">
+	<div class="modal-dialog">
+	<div class="modal-content">
+	<div class="modal-body">
+	
+		<div class="panel panel-default">
+			<div class="panel-heading">
+				<h4 class="panel-title"><span class="float-left space-right">Q${i.index+1})</span> ${questionDto.question}</h4>
+			</div>
+			<div class="panel-body">
+				<div class="table-responsive">
+					<table class="table table-striped table-hover">
+						<tbody>
+						
+							<c:forEach var="optionDto" items="${questionDto.optionDtos}" varStatus="j">
+								<c:set var="cssClass"><c:if test='${optionDto.correct == "Correct"}'>bg-success</c:if></c:set>
+								<tr>
+									<td width="5px" class="${cssClass}">
+										${ALPHABET[j.index]}.
+									</td>
+									<td class="${cssClass}">
+										<c:out value="${optionDto.candidateAnswer}" escapeXml="false"/>
+									</td>
+									<td class="${cssClass}">
+										${optionDto.uid}%
+									</td>
+								</tr>
+							</c:forEach>
+							
+							<tr>
+								<td width="5px">
+									${ALPHABET[fn:length(questionDto.optionDtos)]}.
+								</td>
+								<td>
+									<fmt:message key="label.n.a"/>
+								</td>
+								<td>
+									${questionDto.mark}%
+								</td>
+							</tr>
+							
+						</tbody>
+					</table>
+				</div>
+			</div> 
+		</div>
+	            
+		<div class="modal-footer">	
+			<a href="#" data-dismiss="modal" class="btn btn-default">
+				<fmt:message key="label.close"/>
+			</a>
+		</div>
+	
+	</div>
+	</div>
+	</div>
+	</div>
+</c:forEach>
+<!-- End question detail modal -->
Index: lams_tool_lamc/web/tblmonitoring/teams.jsp
===================================================================
diff -u
--- lams_tool_lamc/web/tblmonitoring/teams.jsp	(revision 0)
+++ lams_tool_lamc/web/tblmonitoring/teams.jsp	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -0,0 +1,38 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<c:forEach var="userAttempt" items="${userAttempts}" varStatus="i">
+	<div class="panel panel-default">
+		<div class="panel-heading">
+			<h4 class="panel-title">
+				<span class="float-left space-right">Q${i.index+1})</span> 
+				<c:out value="${userAttempt.mcQueContent.question}" escapeXml="false"/>
+			</h4> 
+		</div>
+	              
+		<div class="panel-body">
+			<div class="table-responsive">
+				<table class="table table-striped">
+					<tbody>
+						<tr>
+							<td width="5px">
+								${ALPHABET[userAttempt.mcOptionsContent.displayOrder-1]}.
+							</td>
+							<td>
+								<c:out value="${userAttempt.mcOptionsContent.mcQueOptionText}" escapeXml="false"/>
+												
+								<c:choose>
+									<c:when test="${userAttempt.mcOptionsContent.correctOption}">
+										<i class="fa fa-check-square"></i>
+									</c:when>
+									<c:otherwise>
+										<i class="fa fa-minus-square"></i>
+									</c:otherwise>
+								</c:choose>
+							</td>
+						</tr>
+					</tbody>
+				</table>
+			</div>
+		</div>
+	</div>
+</c:forEach>
\ No newline at end of file
Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/dao/ILeaderselectionUserDAO.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d
--- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/dao/ILeaderselectionUserDAO.java	(.../ILeaderselectionUserDAO.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/dao/ILeaderselectionUserDAO.java	(.../ILeaderselectionUserDAO.java)	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -41,6 +41,8 @@
      * @return
      */
     LeaderselectionUser getByUserIdAndSessionId(Long userId, Long toolSessionId);
+    
+    LeaderselectionUser getByUserIdAndContentId(Long userId, Long toolContentId);
 
     void saveOrUpdate(LeaderselectionUser leaderselectionUser);
 
Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/dao/hibernate/LeaderselectionUserDAO.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d
--- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/dao/hibernate/LeaderselectionUserDAO.java	(.../LeaderselectionUserDAO.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/dao/hibernate/LeaderselectionUserDAO.java	(.../LeaderselectionUserDAO.java)	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -37,10 +37,10 @@
 @Repository
 public class LeaderselectionUserDAO extends LAMSBaseDAO implements ILeaderselectionUserDAO {
 
-    public static final String SQL_QUERY_FIND_BY_USER_ID_SESSION_ID = "from " + LeaderselectionUser.class.getName()
+    private static final String SQL_QUERY_FIND_BY_USER_ID_SESSION_ID = "from " + LeaderselectionUser.class.getName()
 	    + " as f" + " where user_id=? and f.leaderselectionSession.sessionId=?";
 
-    public static final String SQL_QUERY_FIND_BY_LOGIN_NAME_SESSION_ID = "from " + LeaderselectionUser.class.getName()
+    private static final String SQL_QUERY_FIND_BY_LOGIN_NAME_SESSION_ID = "from " + LeaderselectionUser.class.getName()
 	    + " as f where login_name=? and f.leaderselectionSession.sessionId=?";
 
     private static final String SQL_QUERY_FIND_BY_UID = "from " + LeaderselectionUser.class.getName() + " where uid=?";
@@ -51,13 +51,23 @@
     @Override
     public LeaderselectionUser getByUserIdAndSessionId(Long userId, Long toolSessionId) {
 	List list = doFind(SQL_QUERY_FIND_BY_USER_ID_SESSION_ID, new Object[] { userId, toolSessionId });
-
 	if (list == null || list.isEmpty()) {
 	    return null;
 	}
-
 	return (LeaderselectionUser) list.get(0);
     }
+    
+    @Override
+    public LeaderselectionUser getByUserIdAndContentId(Long userId, Long toolContentId) {
+	final String SQL_QUERY_FIND_BY_USER_ID_CONTENT_ID = "from " + LeaderselectionUser.class.getName()
+		    + " as user where user.userId=? and user.leaderselectionSession.leaderselection.toolContentId=?";
+	
+	List list = doFind(SQL_QUERY_FIND_BY_USER_ID_CONTENT_ID, new Object[] { userId, toolContentId });
+	if (list == null || list.isEmpty()) {
+	    return null;
+	}
+	return (LeaderselectionUser) list.get(0);
+    }
 
     @Override
     public void saveOrUpdate(LeaderselectionUser leaderselectionUser) {
@@ -68,11 +78,9 @@
     @Override
     public LeaderselectionUser getByUID(Long uid) {
 	List list = doFind(SQL_QUERY_FIND_BY_UID, new Object[] { uid });
-
 	if (list == null || list.isEmpty()) {
 	    return null;
 	}
-
 	return (LeaderselectionUser) list.get(0);
     }
 
Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/ILeaderselectionService.java
===================================================================
diff -u -r2abc3485dc2d24ea02044a64271f3ee0d3b8c11b -r5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d
--- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/ILeaderselectionService.java	(.../ILeaderselectionService.java)	(revision 2abc3485dc2d24ea02044a64271f3ee0d3b8c11b)
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/ILeaderselectionService.java	(.../ILeaderselectionService.java)	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -52,10 +52,11 @@
      *
      * @param userId
      * @param toolSessionId
+     * @return 
      * @throws IOException 
      * @throws JSONException 
      */
-    void setGroupLeader(Long userId, Long toolSessionId) throws JSONException, IOException;
+    boolean setGroupLeader(Long userId, Long toolSessionId) throws JSONException, IOException;
 
     /**
      * Makes a copy of the default content and assigns it a newContentID
@@ -109,6 +110,8 @@
      * @return
      */
     LeaderselectionUser getUserByUserIdAndSessionId(Long userId, Long toolSessionId);
+    
+    LeaderselectionUser getUserByUserIdAndContentId(Long userId, Long toolContentId);
 
     /**
      *
Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java
===================================================================
diff -u -r64ee69765400783a3e284e7856aa91cdd01f4831 -r5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d
--- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java	(.../LeaderselectionService.java)	(revision 64ee69765400783a3e284e7856aa91cdd01f4831)
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java	(.../LeaderselectionService.java)	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -338,21 +338,22 @@
     /* ********** ILeaderselectionService Methods ********************************* */
 
     @Override
-    public void setGroupLeader(Long userUid, Long toolSessionId) throws JSONException, IOException {
+    public boolean setGroupLeader(Long userUid, Long toolSessionId) throws JSONException, IOException {
 	if ((userUid == null) || (toolSessionId == null)) {
-	    return;
+	    return false;
 	}
 
 	LeaderselectionSession session = getSessionBySessionId(toolSessionId);
 	LeaderselectionUser newLeader = getUserByUID(userUid);
 	if ((session == null) || (newLeader == null)) {
 	    LeaderselectionService.logger
 		    .error("Wrong parameters supplied. SessionId=" + toolSessionId + " UserId=" + userUid);
-	    return;
+	    return false;
 	}
 
 	session.setGroupLeader(newLeader);
 	saveOrUpdateSession(session);
+	return true;
     }
 
     @Override
@@ -452,6 +453,11 @@
     public LeaderselectionUser getUserByUserIdAndSessionId(Long userId, Long toolSessionId) {
 	return leaderselectionUserDAO.getByUserIdAndSessionId(userId, toolSessionId);
     }
+    
+    @Override
+    public LeaderselectionUser getUserByUserIdAndContentId(Long userId, Long toolContentId) {
+	return leaderselectionUserDAO.getByUserIdAndContentId(userId, toolContentId);
+    }
 
     @Override
     public LeaderselectionUser getUserByUID(Long uid) {
Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/TblMonitoringAction.java
===================================================================
diff -u
--- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/TblMonitoringAction.java	(revision 0)
+++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/TblMonitoringAction.java	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -0,0 +1,64 @@
+package org.lamsfoundation.lams.tool.leaderselection.web.actions;
+
+import java.io.IOException;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.log4j.Logger;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.tomcat.util.json.JSONException;
+import org.apache.tomcat.util.json.JSONObject;
+import org.lamsfoundation.lams.tool.leaderselection.model.LeaderselectionUser;
+import org.lamsfoundation.lams.tool.leaderselection.service.ILeaderselectionService;
+import org.lamsfoundation.lams.tool.leaderselection.service.LeaderselectionServiceProxy;
+import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.action.LamsDispatchAction;
+import org.lamsfoundation.lams.web.util.AttributeNames;
+
+public class TblMonitoringAction extends LamsDispatchAction {
+
+    private static Logger log = Logger.getLogger(TblMonitoringAction.class);
+
+    private ILeaderselectionService leaderselectionService;
+    
+    /**
+     * Save selected user as a leader
+     * @throws IOException 
+     * @throws JSONException 
+     */
+    public ActionForward changeLeader(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws JSONException, IOException {
+	initService();
+	
+	Long leaderUserId = WebUtil.readLongParam(request, AttributeNames.PARAM_USER_ID);
+	Long toolContentId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
+	LeaderselectionUser user = leaderselectionService.getUserByUserIdAndContentId(leaderUserId, toolContentId);
+
+	// save selected user as a leader
+	boolean isSuccessful = false;
+	if (user != null) {
+	    Long toolSessionId = user.getLeaderselectionSession().getSessionId();
+	    log.info("Changing group leader for toolSessionId=" + toolSessionId + ". New leader's userUid="
+		    + leaderUserId);
+	    isSuccessful = leaderselectionService.setGroupLeader(user.getUid(), toolSessionId);
+	}
+
+	// build JSON
+	JSONObject responseJSON = new JSONObject();
+	responseJSON.put("isSuccessful", isSuccessful);
+	writeResponse(response, "text/json", LamsDispatchAction.ENCODING_UTF8, responseJSON.toString());
+	return null;
+    }
+
+    /**
+     * set up service
+     */
+    private void initService() {
+	if (leaderselectionService == null) {
+	    leaderselectionService = LeaderselectionServiceProxy.getLeaderselectionService(this.getServlet().getServletContext());
+	}
+    }
+}
\ No newline at end of file
Index: lams_tool_leader/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r65efb0abb529cafc1977e284e2c9a4ed33722334 -r5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d
--- lams_tool_leader/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 65efb0abb529cafc1977e284e2c9a4ed33722334)
+++ lams_tool_leader/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -97,6 +97,16 @@
         redirect="false"
       />
     </action>
+    <action
+      path="/tblmonitoring"
+      type="org.lamsfoundation.lams.tool.leaderselection.web.actions.TblMonitoringAction"
+      name="monitoringForm"
+      scope="request"
+      parameter="method"
+      unknown="false"
+      validate="false"
+    >
+    </action>
 
   </action-mappings>
 
Index: lams_tool_leader/web/WEB-INF/web.xml
===================================================================
diff -u -r2a70ed7d169b7c8fe70237c266eb6194f3392164 -r5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d
--- lams_tool_leader/web/WEB-INF/web.xml	(.../web.xml)	(revision 2a70ed7d169b7c8fe70237c266eb6194f3392164)
+++ lams_tool_leader/web/WEB-INF/web.xml	(.../web.xml)	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -248,6 +248,21 @@
 			<role-name>SYSADMIN</role-name>
 		</auth-constraint>
 	</security-constraint>
+	<security-constraint>
+		<web-resource-collection>
+			<web-resource-name>TBL Monitor interface</web-resource-name>
+			<url-pattern>/tblmonitoring.do</url-pattern>
+			<http-method>GET</http-method>
+ 			<http-method>POST</http-method>
+		</web-resource-collection>
+		<auth-constraint>
+			<!-- Author can preview the lesson -->
+			<role-name>MONITOR</role-name>
+			<role-name>GROUP ADMIN</role-name>
+			<role-name>GROUP MANAGER</role-name>
+			<role-name>SYSADMIN</role-name>
+		</auth-constraint>
+	</security-constraint>
 
 	<!-- Security Roles -->
 	<security-role>
Index: lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieUser.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d
--- lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieUser.hbm.xml	(.../ScratchieUser.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_tool_scratchie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/scratchie/model/ScratchieUser.hbm.xml	(.../ScratchieUser.hbm.xml)	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -71,16 +71,6 @@
             column="session_uid"
         />
 
-        <many-to-one
-            name="scratchie"
-            class="org.lamsfoundation.lams.tool.scratchie.model.Scratchie"
-            cascade="none"
-            
-            update="true"
-            insert="true"
-            column="scratchie_uid"
-        />
-
         <property
             name="sessionFinished"
             type="boolean"
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieUserDAO.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieUserDAO.java	(.../ScratchieUserDAO.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieUserDAO.java	(.../ScratchieUserDAO.java)	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -34,4 +34,6 @@
     ScratchieUser getUserByUserIDAndContentID(Long userId, Long contentId);
 
     List<ScratchieUser> getBySessionID(Long sessionId);
+    
+    int countUsersByContentId(Long contentId);
 }
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieUserDAOHibernate.java
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieUserDAOHibernate.java	(.../ScratchieUserDAOHibernate.java)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieUserDAOHibernate.java	(.../ScratchieUserDAOHibernate.java)	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -34,7 +34,7 @@
 public class ScratchieUserDAOHibernate extends LAMSBaseDAO implements ScratchieUserDAO {
 
     private static final String FIND_BY_USER_ID_CONTENT_ID = "from " + ScratchieUser.class.getName()
-	    + " as u where u.userId =? and u.scratchie.contentId=?";
+	    + " as u where u.userId =? and u.session.scratchie.contentId=?";
     private static final String FIND_BY_USER_ID_SESSION_ID = "from " + ScratchieUser.class.getName()
 	    + " as u where u.userId =? and u.session.sessionId=?";
     private static final String FIND_BY_SESSION_ID = "from " + ScratchieUser.class.getName()
@@ -63,5 +63,17 @@
     public List<ScratchieUser> getBySessionID(Long sessionId) {
 	return (List<ScratchieUser>) this.doFind(FIND_BY_SESSION_ID, sessionId);
     }
-
+    
+    @Override
+    public int countUsersByContentId(Long contentId) {
+	final String COUNT_USERS_BY_CONTENT_ID = "SELECT COUNT(*) FROM " + ScratchieUser.class.getName()
+		+ " as user WHERE user.session.scratchie.contentId = :contentId ";
+	    
+	List list = getSession().createQuery(COUNT_USERS_BY_CONTENT_ID).setLong("contentId", contentId).list();
+	if (list == null || list.size() == 0) {
+	    return 0;
+	} else {
+	    return ((Number) list.get(0)).intValue();
+	}
+    }
 }
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20180223.sql
===================================================================
diff -u
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20180223.sql	(revision 0)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20180223.sql	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -0,0 +1,17 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+SET FOREIGN_KEY_CHECKS=0;
+----------------------Put all sql statements below here-------------------------
+
+-- LDEV-3224 Ability to change, add, remove questions even after student have reached it
+ALTER TABLE tl_lascrt11_user DROP FOREIGN KEY FK_NEW_610529188_30113BFC309ED320;
+ALTER TABLE tl_lascrt11_user DROP COLUMN scratchie_uid, DROP INDEX FK_NEW_610529188_30113BFC309ED320;
+
+UPDATE lams_tool SET tool_version='20180223' WHERE tool_signature='lascrt11';
+
+----------------------Put all sql statements above here-------------------------
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
+SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieUser.java
===================================================================
diff -u -r83ca314c18ea866bb79570b6e7da25eb8729b3b4 -r5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieUser.java	(.../ScratchieUser.java)	(revision 83ca314c18ea866bb79570b6e7da25eb8729b3b4)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieUser.java	(.../ScratchieUser.java)	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -46,7 +46,6 @@
     private Long portraitId;
 
     private ScratchieSession session;
-    private Scratchie scratchie;
 
     public ScratchieUser() {
     }
@@ -58,7 +57,6 @@
 	this.loginName = user.getLogin();
 	this.portraitId = user.getPortraitUuid();
 	this.session = session;
-	this.scratchie = null;
 	this.sessionFinished = false;
     }
 
@@ -174,18 +172,6 @@
      *
      * @return
      */
-    public Scratchie getScratchie() {
-	return scratchie;
-    }
-
-    public void setScratchie(Scratchie content) {
-	this.scratchie = content;
-    }
-
-    /**
-     *
-     * @return
-     */
     public boolean isSessionFinished() {
 	return sessionFinished;
     }
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
===================================================================
diff -u -r3d40a7e98de7bcd2cb744cdb8dc13c0022fb7bdb -r5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java	(.../IScratchieService.java)	(revision 3d40a7e98de7bcd2cb744cdb8dc13c0022fb7bdb)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java	(.../IScratchieService.java)	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -155,10 +155,14 @@
     /**
      * Get users by given toolSessionId.
      *
-     * @param long1
+     * @param toolSessionId
      * @return
      */
     List<ScratchieUser> getUsersBySession(Long toolSessionId);
+    
+    ScratchieUser getUserByUserIDAndContentID(Long userId, Long contentId);
+    
+    int countUsersByContentId(Long contentId);
 
     /**
      * Save specified user.
@@ -197,6 +201,14 @@
      * @return
      */
     ScratchieSession getScratchieSessionBySessionId(Long sessionId);
+    
+    /**
+     * Return all sessions realted to the specified toolContentId.
+     * 
+     * @param toolContentId
+     * @return
+     */
+    int countSessionsByContentId(Long toolContentId);
 
     /**
      * Save or update scratchie session.
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
===================================================================
diff -u -re2f4b14e2d8f0ef1feef10abdc21f3d446fca2a5 -r5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	(.../ScratchieServiceImpl.java)	(revision e2f4b14e2d8f0ef1feef10abdc21f3d446fca2a5)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java	(.../ScratchieServiceImpl.java)	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -202,9 +202,13 @@
 
     @Override
     public ScratchieUser getUserByIDAndSession(Long userId, Long sessionId) {
-
 	return scratchieUserDao.getUserByUserIDAndSessionID(userId, sessionId);
     }
+    
+    @Override
+    public int countUsersByContentId(Long contentId) {
+	return scratchieUserDao.countUsersByContentId(contentId);
+    }
 
     @Override
     public void saveOrUpdateScratchie(Scratchie scratchie) {
@@ -405,6 +409,11 @@
     public ScratchieSession getScratchieSessionBySessionId(Long sessionId) {
 	return scratchieSessionDao.getSessionBySessionId(sessionId);
     }
+ 
+    @Override
+    public int countSessionsByContentId(Long toolContentId) {
+	return scratchieSessionDao.getByContentId(toolContentId).size();
+    }
 
     @Override
     public void saveOrUpdateScratchieSession(ScratchieSession resSession) {
@@ -628,6 +637,11 @@
     public List<ScratchieUser> getUsersBySession(Long toolSessionId) {
 	return scratchieUserDao.getBySessionID(toolSessionId);
     }
+    
+    @Override
+    public ScratchieUser getUserByUserIDAndContentID(Long userId, Long contentId) {
+	return scratchieUserDao.getUserByUserIDAndContentID(userId, contentId);
+    }
 
     @Override
     public void saveUser(ScratchieUser user) {
@@ -1893,7 +1907,6 @@
 		user.setLastName(sysUser.getLastName());
 		user.setLoginName(sysUser.getLogin());
 		user.setUserId(new Long(newUserUid.longValue()));
-		user.setScratchie(toolContentObj);
 	    }
 
 	    scratchieDao.saveObject(toolContentObj);
Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/TblMonitorAction.java
===================================================================
diff -u
--- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/TblMonitorAction.java	(revision 0)
+++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/TblMonitorAction.java	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -0,0 +1,274 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+
+package org.lamsfoundation.lams.tool.scratchie.web.action;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
+
+import javax.servlet.ServletException;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.log4j.Logger;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.tomcat.util.json.JSONException;
+import org.apache.tomcat.util.json.JSONObject;
+import org.lamsfoundation.lams.tool.scratchie.ScratchieConstants;
+import org.lamsfoundation.lams.tool.scratchie.dto.BurningQuestionDTO;
+import org.lamsfoundation.lams.tool.scratchie.dto.BurningQuestionItemDTO;
+import org.lamsfoundation.lams.tool.scratchie.model.Scratchie;
+import org.lamsfoundation.lams.tool.scratchie.model.ScratchieItem;
+import org.lamsfoundation.lams.tool.scratchie.model.ScratchieUser;
+import org.lamsfoundation.lams.tool.scratchie.service.IScratchieService;
+import org.lamsfoundation.lams.tool.scratchie.util.ScratchieItemComparator;
+import org.lamsfoundation.lams.util.AlphanumComparator;
+import org.lamsfoundation.lams.util.ExcelCell;
+import org.lamsfoundation.lams.util.ExcelUtil;
+import org.lamsfoundation.lams.util.FileUtil;
+import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.action.LamsDispatchAction;
+import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+public class TblMonitorAction extends LamsDispatchAction {
+    private static Logger log = Logger.getLogger(TblMonitorAction.class);
+
+    private static IScratchieService scratchieService;
+
+    /**
+     * Shows tra page
+     */
+    public ActionForward tra(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	initializeScratchieService();
+
+	long toolContentId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
+	Scratchie scratchie = scratchieService.getScratchieByContentId(toolContentId);
+
+	int attemptedLearnersNumber = scratchieService.countUsersByContentId(toolContentId);
+	request.setAttribute("attemptedLearnersNumber", attemptedLearnersNumber);
+
+	Set<ScratchieItem> items = new TreeSet<ScratchieItem>(new ScratchieItemComparator());
+	items.addAll(scratchie.getScratchieItems());
+	request.setAttribute("items", items);
+
+	if (attemptedLearnersNumber != 0) {
+	    // find first page in excel file
+	    LinkedHashMap<String, ExcelCell[][]> excelDoc = scratchieService.exportExcel(toolContentId);
+	    ExcelCell[][] firstPageData = null;
+	    for (String key : excelDoc.keySet()) {
+		firstPageData = excelDoc.get(key);
+		break;
+	    }
+
+	    int groupsSize = scratchieService.countSessionsByContentId(toolContentId);
+	    ArrayList<String[]> groupRows = new ArrayList<String[]>();
+	    for (int groupCount = 0; groupCount < groupsSize; groupCount++) {
+		ExcelCell[] groupRow = firstPageData[5 + groupCount];
+
+		String[] groupRow2 = new String[2];
+		groupRow2[0] = (String) groupRow[1].getCellValue();
+		groupRow2[1] = ((String) groupRow[groupRow.length - 1].getCellValue()).replaceAll("%", "");
+		groupRows.add(groupRow2);
+	    }
+	    request.setAttribute("groupRows", groupRows);
+	}
+
+	return mapping.findForward("tra");
+    }
+
+    /**
+     * Shows tra StudentChoices page
+     */
+    public ActionForward traStudentChoices(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	initializeScratchieService();
+
+	long toolContentId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
+	Scratchie scratchie = scratchieService.getScratchieByContentId(toolContentId);
+
+	//find second page in excel file
+	LinkedHashMap<String, ExcelCell[][]> excelDoc = scratchieService.exportExcel(toolContentId);
+	ExcelCell[][] secondPageData = null;
+	for (ExcelCell[][] excelPage : excelDoc.values()) {
+	    //check last row string starts with "*" (i.e. the string "*- Denotes the correct answer")
+	    if (excelPage.length > 0) {
+		ExcelCell lastRow = excelPage[excelPage.length - 1][0];
+		if (lastRow != null && ((String) lastRow.getCellValue()).startsWith("*")) {
+		    secondPageData = excelPage;
+		    break;
+		}
+	    }
+	}
+
+	ExcelCell[] correctAnswersRow = secondPageData[4];
+	request.setAttribute("correctAnswers", correctAnswersRow);
+
+	int groupsSize = scratchieService.countSessionsByContentId(toolContentId);
+	ArrayList<ExcelCell[]> groupRows = new ArrayList<ExcelCell[]>();
+	for (int groupCount = 0; groupCount < groupsSize; groupCount++) {
+	    ExcelCell[] groupRow = secondPageData[6 + groupCount];
+	    groupRows.add(groupRow);
+	}
+	request.setAttribute("groupRows", groupRows);
+
+	Set<ScratchieItem> items = new TreeSet<ScratchieItem>(new ScratchieItemComparator());
+	items.addAll(scratchie.getScratchieItems());
+	request.setAttribute("items", items);
+
+	request.setAttribute(AttributeNames.PARAM_TOOL_CONTENT_ID, toolContentId);
+	return mapping.findForward("traStudentChoices");
+    }
+
+    /**
+     * Exports tool results into excel.
+     *
+     * Had to move it from the tool as tool uses SessionMap
+     * 
+     * @throws IOException
+     */
+    public ActionForward exportExcel(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException {
+	initializeScratchieService();
+
+	Long toolContentId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
+	LinkedHashMap<String, ExcelCell[][]> dataToExport = scratchieService.exportExcel(toolContentId);
+
+	String fileName = "scratchie_export.xlsx";
+	fileName = FileUtil.encodeFilenameForDownload(request, fileName);
+
+	response.setContentType("application/x-download");
+	response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
+
+	// Code to generate file and write file contents to response
+	ServletOutputStream out = response.getOutputStream();
+	ExcelUtil.createExcel(out, dataToExport, null, false);
+
+	return null;
+    }
+    
+    /**
+     * Shows Teams page
+     * @throws JSONException 
+     */
+    public ActionForward isBurningQuestionsEnabled(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException, JSONException {
+	initializeScratchieService();
+	
+	long toolContentId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
+	Scratchie scratchie = scratchieService.getScratchieByContentId(toolContentId);
+	
+	// build JSON
+	JSONObject responseJSON = new JSONObject();
+	responseJSON.put("isBurningQuestionsEnabled", scratchie.isBurningQuestionsEnabled());
+	writeResponse(response, "text/json", LamsDispatchAction.ENCODING_UTF8, responseJSON.toString());
+	return null;
+    }   
+
+    /**
+     * Shows Teams page
+     */
+    public ActionForward burningQuestions(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	initializeScratchieService();
+	
+	long toolContentId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
+	Scratchie scratchie = scratchieService.getScratchieByContentId(toolContentId);
+
+	//find available burningQuestionDtos, if any
+	if (scratchie.isBurningQuestionsEnabled()) {
+	    List<BurningQuestionItemDTO> burningQuestionItemDtos = scratchieService.getBurningQuestionDtos(scratchie,
+		    null, true);
+
+	    //unescape previously escaped session names
+	    for (BurningQuestionItemDTO burningQuestionItemDto : burningQuestionItemDtos) {
+		List<BurningQuestionDTO> burningQuestionDtos = burningQuestionItemDto.getBurningQuestionDtos();
+
+		for (BurningQuestionDTO burningQuestionDto : burningQuestionItemDto.getBurningQuestionDtos()) {
+
+		    String escapedBurningQuestion = StringEscapeUtils
+			    .unescapeJavaScript(burningQuestionDto.getEscapedBurningQuestion());
+		    burningQuestionDto.setEscapedBurningQuestion(escapedBurningQuestion);
+
+		    String sessionName = StringEscapeUtils.unescapeJavaScript(burningQuestionDto.getSessionName());
+		    burningQuestionDto.setSessionName(sessionName);
+		}
+
+		Collections.sort(burningQuestionDtos, new Comparator<BurningQuestionDTO>() {
+		    @Override
+		    public int compare(BurningQuestionDTO o1, BurningQuestionDTO o2) {
+			return new AlphanumComparator().compare(o1.getSessionName(), o2.getSessionName());
+		    }
+		});
+	    }
+
+	    request.setAttribute(ScratchieConstants.ATTR_BURNING_QUESTION_ITEM_DTOS, burningQuestionItemDtos);
+	}
+
+	return mapping.findForward("burningQuestions");
+    }
+    
+    /**
+     * Shows Teams page
+     */
+    public ActionForward getModalDialogForTeamsTab(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) throws IOException, ServletException {
+	initializeScratchieService();
+	
+	long toolContentId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
+	Long userId = WebUtil.readLongParam(request, AttributeNames.PARAM_USER_ID);
+	
+	ScratchieUser user = scratchieService.getUserByUserIDAndContentID(userId, toolContentId);
+	Collection<ScratchieItem> scratchieItems = user == null ? new LinkedList<ScratchieItem>()
+		: scratchieService.getItemsWithIndicatedScratches(user.getSession().getSessionId());
+	 
+	request.setAttribute("scratchieItems", scratchieItems);
+	return mapping.findForward("teams");
+    }
+    
+    // *************************************************************************************
+    // Private method
+    // *************************************************************************************
+    private void initializeScratchieService() {
+	if (scratchieService == null) {
+	    WebApplicationContext wac = WebApplicationContextUtils
+		    .getRequiredWebApplicationContext(getServlet().getServletContext());
+	    scratchieService = (IScratchieService) wac.getBean(ScratchieConstants.SCRATCHIE_SERVICE);
+	}
+    }
+}
Index: lams_tool_scratchie/web/WEB-INF/struts-config.xml
===================================================================
diff -u -re2f4b14e2d8f0ef1feef10abdc21f3d446fca2a5 -r5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d
--- lams_tool_scratchie/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision e2f4b14e2d8f0ef1feef10abdc21f3d446fca2a5)
+++ lams_tool_scratchie/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -299,8 +299,17 @@
 			type="org.lamsfoundation.lams.tool.scratchie.web.action.MonitoringAction"
 			parameter="statistic" >
 			<forward name="success" path="/pages/monitoring/parts/statisticpart.jsp" />
-		</action>			
+		</action>
 		
+		<action path="/tblmonitoring"
+			type="org.lamsfoundation.lams.tool.scratchie.web.action.TblMonitorAction"
+			parameter="method" >
+			<forward name="tra" path="/pages/tblmonitoring/tra.jsp" />
+			<forward name="traStudentChoices" path="/pages/tblmonitoring/traStudentChoices.jsp" />
+			<forward name="burningQuestions" path="/pages/tblmonitoring/burningQuestions.jsp" />
+			<forward name="teams" path="/pages/tblmonitoring/teams.jsp" />
+		</action>
+		
 		<!-- ========== Admin Definitions ============================== -->		
 		<action path="/admin/start"
 			type="org.lamsfoundation.lams.tool.scratchie.web.action.AdminAction"
Index: lams_tool_scratchie/web/WEB-INF/web.xml
===================================================================
diff -u -r2a70ed7d169b7c8fe70237c266eb6194f3392164 -r5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d
--- lams_tool_scratchie/web/WEB-INF/web.xml	(.../web.xml)	(revision 2a70ed7d169b7c8fe70237c266eb6194f3392164)
+++ lams_tool_scratchie/web/WEB-INF/web.xml	(.../web.xml)	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -247,6 +247,21 @@
 			<role-name>SYSADMIN</role-name>
 		</auth-constraint>
 	</security-constraint>
+	<security-constraint>
+		<web-resource-collection>
+			<web-resource-name>TBL Monitor interface</web-resource-name>
+			<url-pattern>/tblmonitoring.do</url-pattern>
+			<http-method>GET</http-method>
+ 			<http-method>POST</http-method>
+		</web-resource-collection>
+		<auth-constraint>
+			<!-- Author can preview the lesson -->
+			<role-name>MONITOR</role-name>
+			<role-name>GROUP ADMIN</role-name>
+			<role-name>GROUP MANAGER</role-name>
+			<role-name>SYSADMIN</role-name>
+		</auth-constraint>
+	</security-constraint>
 
 	<security-constraint>
 		<web-resource-collection>
Index: lams_tool_scratchie/web/common/taglibs.jsp
===================================================================
diff -u -r6aaee4b2fe2caa08b0c63a0de11f05042d5a3e18 -r5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d
--- lams_tool_scratchie/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision 6aaee4b2fe2caa08b0c63a0de11f05042d5a3e18)
+++ lams_tool_scratchie/web/common/taglibs.jsp	(.../taglibs.jsp)	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -9,4 +9,7 @@
 <%@ taglib uri="tags-xml" prefix="x" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
+<c:set var="ALPHABET" value="${fn:split('a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z', ',')}" scope="request"/>
+<c:set var="ALPHABET_CAPITAL_LETTERS" value="${fn:split('A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X,Y,Z', ',')}" scope="request"/>
 
+
Index: lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp
===================================================================
diff -u
--- lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp	(revision 0)
+++ lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -0,0 +1,72 @@
+<%@ include file="/common/taglibs.jsp"%>         
+
+<!-- Header -->
+<div class="row no-gutter">
+	<div class="col-xs-12 col-md-12 col-lg-8">
+		<h3>
+			<fmt:message key="label.burning.questions"/>
+		</h3>
+	</div>
+</div>
+<!-- End header -->              
+
+<!-- Tables -->
+<div class="row no-gutter">
+<div class="col-xs-12 col-md-12 col-lg-10">
+
+	<c:forEach var="burningQuestionItemDto" items="${burningQuestionItemDtos}" varStatus="i">
+		<c:set var="burningQsCount" value="${fn:length(burningQuestionItemDto.burningQuestionDtos)}"/>
+		<c:set var="item" value="${burningQuestionItemDto.scratchieItem}"/>
+		
+		<div class="panel panel-default">
+			<div class="panel-heading">
+				<h4 class="panel-title panel-collapse">
+					<c:choose>
+						<c:when test="${burningQsCount != 0}">
+							<a data-toggle="collapse" data-target="#collapse-${item.uid}" href="#collapse-${item.uid}" class="collapsed">
+								Q${i.index+1}) <c:out value="${item.title}" escapeXml="false"/>
+							</a>
+						</c:when>
+						<c:otherwise>
+							Q${i.index+1}) <c:out value="${item.title}" escapeXml="false"/> 
+						</c:otherwise>
+					</c:choose>
+					<span class="burning-question-description">
+						<c:out value="${item.description}" escapeXml="false"/> 
+					</span>
+
+					<span class="burning-question-count"><small>[${burningQsCount}]</small></span>
+				</h4>
+			</div>
+		
+			<c:if test="${burningQsCount > 0}">
+				<div id="collapse-${item.uid}" class="panel-collapse collapse">
+				<div class="panel-body">
+				<div class="table-responsive">
+					<table class="table table-striped table-bordered table-hover">
+						<tbody>
+							<c:forEach var="burningQuestionDto" items="${burningQuestionItemDto.burningQuestionDtos}">
+								<tr>
+									<td class="text-nowrap">
+										<c:out value="${burningQuestionDto.sessionName}" escapeXml="false"/>
+									</td>
+									<td>
+										${burningQuestionDto.escapedBurningQuestion}
+									</td>
+									<td class="text-nowrap">
+										${burningQuestionDto.likeCount} <i class="fa fa-thumbs-o-up" style="color:darkblue"></i>
+									</td>
+								</tr>
+							</c:forEach>
+						</tbody>
+					</table>
+				</div>
+				</div>
+				</div>
+			</c:if>
+			
+		</div>
+	</c:forEach>    
+  
+</div>
+</div>
Index: lams_tool_scratchie/web/pages/tblmonitoring/teams.jsp
===================================================================
diff -u
--- lams_tool_scratchie/web/pages/tblmonitoring/teams.jsp	(revision 0)
+++ lams_tool_scratchie/web/pages/tblmonitoring/teams.jsp	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -0,0 +1,46 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<c:forEach var="item" items="${scratchieItems}" varStatus="i">
+	<div class="panel panel-default">
+			
+		<div class="panel-heading">
+			<h4 class="panel-title">
+				<span class="float-left space-right">Q${i.index+1})</span> 
+				<c:out value="${item.title}" escapeXml="false"/>
+			</h4> 
+		</div>
+				
+		<div class="panel-body">
+			<div class="table-responsive">
+				<table class="table table-striped">
+					<tbody>
+						<c:forEach var="answer" items="${item.answers}" varStatus="j">
+							<c:if test="${answer.scratched}">
+									
+								<tr>
+									<td width="5px">
+										${ALPHABET[j.index]}.
+									</td>
+									<td>
+										<c:out value="${answer.description}" escapeXml="false"/>
+										
+										<c:choose>
+											<c:when test="${answer.correct}">
+												<i class="fa fa-check-square"></i>
+											</c:when>
+											<c:otherwise>
+												<i class="fa fa-minus-square"></i>
+											</c:otherwise>
+										</c:choose>
+									</td>
+								</tr>
+										
+							</c:if>
+						</c:forEach>
+					</tbody>
+				</table>
+			</div>
+		</div>
+				
+	</div> 
+</c:forEach>
Index: lams_tool_scratchie/web/pages/tblmonitoring/tra.jsp
===================================================================
diff -u
--- lams_tool_scratchie/web/pages/tblmonitoring/tra.jsp	(revision 0)
+++ lams_tool_scratchie/web/pages/tblmonitoring/tra.jsp	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -0,0 +1,123 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<!-- ChartJS. Colour used is brand-primary for purple skin. -->
+<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/chartjs.js"></script>
+<script>
+	$(document).ready(function(){
+		var barData = {
+			labels: [<c:forEach var="groupRow" items="${groupRows}">"${groupRow[0]}",</c:forEach>],
+			datasets: [{
+				label: "My First dataset",
+				fillColor: "#85237d",
+				strokeColor: "#85237d",
+				highlightFill: "#85237d",
+				highlightStroke: "#85237d",
+				data: [<c:forEach var="groupRow" items="${groupRows}">${groupRow[1]},</c:forEach>]
+			}]
+		};
+
+		var barOptions = {
+			scaleBeginAtZero: true,
+			scaleShowGridLines: true,
+			scaleGridLineColor: "rgba(0,0,0,.05)",
+			scaleGridLineWidth: 1,
+			barShowStroke: true,
+			barStrokeWidth: 2,
+			barValueSpacing: 5,
+			barDatasetSpacing: 1,
+			responsive: true,
+		};
+
+		var ctx = document.getElementById("barChart").getContext("2d");
+		var myNewChart = new Chart(ctx).Bar(barData, barOptions);
+
+		//insert total learners number taken from the parent tblmonitor.jsp
+		$("#total-learners-number").html(TOTAL_LESSON_LEARNERS_NUMBER);
+	});
+</script>
+
+<!-- Header -->
+<div class="row no-gutter">
+	<div class="col-xs-12 col-md-12 col-lg-8">
+		<h3>
+			<fmt:message key="label.tra.questions.marks"/>
+		</h3>
+	</div>
+</div>
+<!-- End header -->    
+
+<!-- Notifications -->  
+<div class="row no-gutter">
+	<div class="col-xs-6 col-md-4 col-lg-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"/>: ${attemptedLearnersNumber}/<span id="total-learners-number"></span> 
+				</h4> 
+			</div>
+		</div>
+	</div>
+	
+	<c:if test="${attemptedLearnersNumber != 0}">
+		<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('traStudentChoices'); return false;">
+				<i class="fa fa-file"></i>
+				<fmt:message key="label.show.students.choices"/>
+			</a>
+		</div>
+	</c:if>                                   
+</div>
+<!-- End notifications -->              
+
+<!-- Tables -->
+<c:forEach var="item" items="${items}" varStatus="i">
+	<div class="row no-gutter">
+	<div class="col-xs-12 col-md-12 col-lg-10">
+	<div class="panel panel-default">
+		<div class="panel-heading">
+			<h4 class="panel-title">
+				Q${i.index+1}) <c:out value="${item.description}" escapeXml="false"/>
+			</h4> 
+		</div>
+		
+		<div class="panel-body">
+			<div class="table-responsive">
+				<table class="table table-striped">
+					<tbody>
+						<c:forEach var="answer" items="${item.answers}" varStatus="j">
+							<tr>
+								<td width="5px">
+									${ALPHABET[j.index]}.
+								</td>
+								<td>
+									<c:out value="${answer.description}" escapeXml="false"/>
+								</td>
+							</tr>
+						</c:forEach>
+					</tbody>
+				</table>
+			</div>
+		</div>
+	</div>  
+	</div>
+	</div>
+</c:forEach>
+<!-- End tables -->
+
+<!-- Chart -->
+<div class="row no-gutter">
+	<div class="col-xs-12 col-md-12 col-lg-10">
+		<div class="panel panel-default">
+			<div class="panel-heading">
+				<fmt:message key="label.tra.results.by.team"/> <small>(<fmt:message key="label.average"/>)</small>
+			</div>
+			
+			<div class="panel-body">
+				<canvas id="barChart" height="240" width="515" style="width: 515px; height: 240px;"></canvas>
+			</div>
+		</div>  
+	</div>
+</div>
+<!-- Chart ends-->
Index: lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp
===================================================================
diff -u
--- lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp	(revision 0)
+++ lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp	(revision 5d1d1bc2d08ed13455ca34ceb5ab94e5f918855d)
@@ -0,0 +1,174 @@
+<%@ include file="/common/taglibs.jsp"%>
+
+<script>
+	function exportExcel(){
+		location.href = "<lams:LAMSURL/>tool/lascrt11/tblmonitoring.do?method=exportExcel&toolContentID=${toolContentID}&reqID=" + (new Date()).getTime();
+	};
+</script>
+
+<!-- Header -->
+<div class="row no-gutter">
+	<div class="col-xs-12 col-md-12 col-lg-8">
+		<h3>
+			<fmt:message key="label.tra.questions.marks"/>
+		</h3>
+	</div>
+</div>
+<!-- End header -->
+
+<!-- Notifications -->  
+<div class="row">
+	<div class="col-md-6 col-lg-4 ">
+	</div>
+	
+	<div class="col-xs-12 col-md-6 col-lg-4 col-lg-offset-2">
+		<a href="#nogo" type="button" class="btn btn-sm btn-default buttons_column"
+				onclick="javascript:loadTab('tra'); return false;">
+			<i class="fa fa-undo"></i>
+			<fmt:message key="label.hide.students.choices"/>
+		</a>
+		<a href="#nogo" onclick="javascript:printTable(); return false;" type="button" class="btn btn-sm btn-default buttons_column">
+			<i class="fa fa-print"></i>
+			<fmt:message key="label.print"/>
+		</a>
+		<a href="#nogo" onclick="javascript:exportExcel(); return false;" type="button" class="btn btn-sm btn-default buttons_column">
+			<i class="fa fa-file"></i>
+			<fmt:message key="label.export.excel"/>
+		</a>
+	</div>
+</div>
+<br>
+<!-- End notifications -->
+
+<!-- Table --> 
+<div class="row no-gutter">
+<div class="col-xs-12 col-md-12 col-lg-10">
+<div class="panel">
+<div class="panel-body table-responsive">
+          
+	<table id="questions-data" class="table table-responsive table-striped table-bordered table-hover table-condensed">
+		<thead>
+			<tr role="row">
+			
+				<th></th>
+				<c:forEach var="item" items="${items}" varStatus="i">
+					<th class="text-center">
+						<a data-toggle="modal" href="#question${i.index}Modal">
+							<fmt:message key="label.authoring.basic.question.text"/> ${i.index + 1}
+						</a>
+					</th>
+				</c:forEach>
+				<th class="text-center">
+					<fmt:message key="label.total"/>
+				</th>
+				<th class="text-center">
+					<fmt:message key="label.total"/> %
+				</th>
+				
+			</tr>
+		</thead>
+		<tbody>
+		
+			<tr>
+				<td>
+					<b>
+						<fmt:message key="label.correct.answer"/>
+					</b>
+				</td>
+				<c:forEach begin="1" end="${fn:length(correctAnswers) - 1}" var="i">
+					<td class="text-center">
+						${correctAnswers[i].cellValue}
+					</td>
+				</c:forEach>
+				<td class="text-center"></td>
+				<td class="text-center"></td>
+			</tr>
+			
+			<tr>
+				<td colspan="7" style="font-weight: bold;">
+					<fmt:message key="label.teams.notuppercase"/>
+				</td> 
+			</tr>
+			
+			<c:forEach var="groupRow" items="${groupRows}" varStatus="i">
+				<tr>
+					<td class="text-center">
+						${groupRow[0].cellValue}
+					</td>
+					
+					<c:choose>
+						<c:when test="${fn:length(groupRow) == 1}">
+							<c:forEach begin="1" end="${fn:length(items) + 2}">
+								<td></td>
+							</c:forEach>
+						</c:when>
+						<c:otherwise>
+							<c:forEach begin="1" end="${fn:length(groupRow) - 1}" var="j">
+								<td class="text-center <c:if test="${groupRow[j].color == 'GREEN'}">success</c:if>"
+								>
+									${groupRow[j].cellValue}
+								</td>
+							</c:forEach>
+						</c:otherwise>
+					</c:choose>
+					
+				</tr>
+			</c:forEach>                                               
+		</tbody>
+	</table>
+</div>
+</div>
+</div>          
+</div>
+
+<!-- Question detail modal -->
+<c:forEach var="item" items="${items}" varStatus="i">
+	<div class="modal fade" id="question${i.index}Modal">
+	<div class="modal-dialog">
+	<div class="modal-content">
+	<div class="modal-body">
+	
+		<div class="panel panel-default">
+			<div class="panel-heading">
+				<h4 class="panel-title"><span class="float-left space-right">Q${i.index+1})</span> ${item.title}</h4>
+			</div>
+			<div class="panel-body">
+			
+				<div>
+					${item.description}
+				</div>
+			
+				<div class="table-responsive voffset10">
+					<table class="table table-striped table-hover">
+						<tbody>
+						
+							<c:forEach var="answer" items="${item.answers}" varStatus="j">
+								<c:set var="cssClass"><c:if test='${answer.correct}'>bg-success</c:if></c:set>
+								<tr>
+									<td width="5px" class="${cssClass}">
+										${ALPHABET[j.index]}.
+									</td>
+									<td class="${cssClass}">
+										<c:out value="${answer.description}" escapeXml="false"/>
+									</td>
+								</tr>
+							</c:forEach>
+							
+						</tbody>
+					</table>
+				</div>
+			</div> 
+		</div>
+	            
+		<div class="modal-footer">	
+			<a href="#" data-dismiss="modal" class="btn btn-default">
+				<fmt:message key="button.close"/>
+			</a>
+		</div>
+	
+	</div>
+	</div>
+	</div>
+	</div>
+</c:forEach>
+<!-- End question detail modal -->