Index: lams_build/lib/lams/lams.jar =================================================================== RCS file: /usr/local/cvsroot/lams_build/lib/lams/lams.jar,v diff -u -r1.480 -r1.481 Binary files differ Index: lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java,v diff -u -r1.37 -r1.38 --- lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java 21 May 2015 23:39:28 -0000 1.37 +++ lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java 5 Jan 2016 16:05:38 -0000 1.38 @@ -75,6 +75,12 @@ public static final String PARAM_EXT_LMS_ID = "extlmsid"; public static final String PARAM_CREATE_DATE_TIME = "createDateTime"; public static final String PARAM_NOTIFY_CLOSE_URL = "notifyCloseURL"; + + // jqGrid parameters + public static final String PARAM_PAGE = "page"; + public static final String PARAM_ROWS = "rows"; + public static final String PARAM_SIDX = "sidx"; + public static final String PARAM_SORD = "sord"; public static final String PARAM_LIB = "library"; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java,v diff -u -r1.113 -r1.114 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java 25 Jun 2015 20:36:04 -0000 1.113 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java 5 Jan 2016 16:00:41 -0000 1.114 @@ -264,6 +264,7 @@ public static final String LIST_GROUPING_DATA = "listGroupingData"; public static final String LEARNER_NAME = "learnerName"; public static final String LIST_MONITORED_MARKS_CONTAINER_DTO = "listMonitoredMarksContainerDto"; + public static final String SESSION_DTOS = "sessionDtos"; public static final String TIMEZONE = "timeZone"; public static final String QUESTION_LISTING_MODE = "questionListingMode"; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McOptionDTO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McOptionDTO.java,v diff -u -r1.1 -r1.2 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McOptionDTO.java 17 May 2014 19:54:42 -0000 1.1 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McOptionDTO.java 5 Jan 2016 16:00:41 -0000 1.2 @@ -22,7 +22,6 @@ /* $$Id$$ */ package org.lamsfoundation.lams.tool.mc; -import org.apache.commons.lang.builder.ToStringBuilder; import org.lamsfoundation.lams.tool.mc.pojos.McOptsContent; /** Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQuestionDTO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQuestionDTO.java,v diff -u -r1.1 -r1.2 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQuestionDTO.java 17 May 2014 19:54:42 -0000 1.1 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQuestionDTO.java 5 Jan 2016 16:00:41 -0000 1.2 @@ -25,8 +25,6 @@ import java.util.List; -import org.apache.commons.lang.builder.ToStringBuilder; - /** * DTO that holds users attempt history data for jsp purposes * Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java,v diff -u -r1.62 -r1.63 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java 9 Sep 2014 16:42:13 -0000 1.62 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java 5 Jan 2016 16:00:41 -0000 1.63 @@ -24,10 +24,7 @@ import javax.servlet.http.HttpServletRequest; -import org.lamsfoundation.lams.tool.mc.pojos.McContent; -import org.lamsfoundation.lams.tool.mc.service.IMcService; import org.lamsfoundation.lams.tool.mc.web.McAuthoringForm; -import org.lamsfoundation.lams.web.util.SessionMap; /** * Common MCQ utility functions live here. Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java,v diff -u -r1.18 -r1.19 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java 17 May 2014 19:54:43 -0000 1.18 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java 5 Jan 2016 16:00:41 -0000 1.19 @@ -22,6 +22,9 @@ /* $$Id$$ */ package org.lamsfoundation.lams.tool.mc.dao; +import java.util.List; + +import org.lamsfoundation.lams.tool.mc.McUserMarkDTO; import org.lamsfoundation.lams.tool.mc.pojos.McQueUsr; /** @@ -42,11 +45,11 @@ * an identifier for the McQueUsr. * @return the persistent instance of a McQueUsr or null if not found */ - public McQueUsr getMcUserByUID(Long uid); + McQueUsr getMcUserByUID(Long uid); - public McQueUsr getMcUserBySession(Long userId, Long sessionUid); + McQueUsr getMcUserBySession(Long userId, Long sessionUid); - public void saveMcUser(McQueUsr mcUser); + void saveMcUser(McQueUsr mcUser); /** *

@@ -56,7 +59,7 @@ * @param nbUser * The instance of McQueUsr to persist. */ - public void updateMcUser(McQueUsr mcUser); + void updateMcUser(McQueUsr mcUser); /** *

@@ -66,8 +69,13 @@ * @param nbUser * The instance of McQueUsr to delete. */ - public void removeMcUser(McQueUsr mcUser); + void removeMcUser(McQueUsr mcUser); /** Get the max, min and average mark (in that order) for a session */ - public Integer[] getMarkStatisticsForSession(Long sessionUid); + Integer[] getMarkStatisticsForSession(Long sessionUid); + + List getPagedUsersBySession(Long sessionId, int page, int size, String sortBy, String sortOrder, + String searchString); + + int getCountPagedUsersBySession(Long sessionId, String searchString); } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McContentDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McContentDAO.java,v diff -u -r1.24 -r1.25 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McContentDAO.java 9 Sep 2014 16:42:13 -0000 1.24 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McContentDAO.java 5 Jan 2016 16:00:41 -0000 1.25 @@ -25,12 +25,9 @@ import java.util.List; import org.hibernate.FlushMode; -import org.hibernate.HibernateException; -import org.hibernate.Session; import org.lamsfoundation.lams.tool.mc.dao.IMcContentDAO; import org.lamsfoundation.lams.tool.mc.pojos.McContent; import org.lamsfoundation.lams.tool.mc.pojos.McSession; -import org.springframework.orm.hibernate3.HibernateCallback; import org.springframework.orm.hibernate3.HibernateTemplate; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McOptionsContentDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McOptionsContentDAO.java,v diff -u -r1.29 -r1.30 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McOptionsContentDAO.java 9 Sep 2014 16:42:13 -0000 1.29 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McOptionsContentDAO.java 5 Jan 2016 16:00:41 -0000 1.30 @@ -22,16 +22,13 @@ /* $$Id$$ */ package org.lamsfoundation.lams.tool.mc.dao.hibernate; -import java.util.Iterator; import java.util.LinkedList; import java.util.List; import org.apache.log4j.Logger; -import org.hibernate.FlushMode; import org.lamsfoundation.lams.tool.mc.McOptionDTO; import org.lamsfoundation.lams.tool.mc.dao.IMcOptionsContentDAO; import org.lamsfoundation.lams.tool.mc.pojos.McOptsContent; -import org.springframework.orm.hibernate3.HibernateTemplate; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; /** Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java,v diff -u -r1.35 -r1.36 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java 9 Sep 2014 16:42:13 -0000 1.35 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java 5 Jan 2016 16:00:41 -0000 1.36 @@ -22,7 +22,6 @@ /* $$Id$$ */ package org.lamsfoundation.lams.tool.mc.dao.hibernate; -import java.util.Iterator; import java.util.List; import org.hibernate.FlushMode; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java,v diff -u -r1.24 -r1.25 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java 17 May 2014 19:54:43 -0000 1.24 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java 5 Jan 2016 16:00:42 -0000 1.25 @@ -22,9 +22,12 @@ /* $$Id$$ */ package org.lamsfoundation.lams.tool.mc.dao.hibernate; +import java.util.ArrayList; import java.util.List; import org.hibernate.FlushMode; +import org.hibernate.Query; +import org.lamsfoundation.lams.tool.mc.McUserMarkDTO; import org.lamsfoundation.lams.tool.mc.dao.IMcUserDAO; import org.lamsfoundation.lams.tool.mc.pojos.McQueUsr; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; @@ -90,4 +93,69 @@ } + public List getPagedUsersBySession(Long sessionId, int page, int size, String sortBy, + String sortOrder, String searchString) { + + + final String LOAD_USERS = "SELECT DISTINCT user.uid, user.fullname, user.lastAttemptTotalMark " + + "FROM "+ McQueUsr.class.getName() + " user " + + "WHERE user.mcSession.mcSessionId = :sessionId " + + " AND (user.fullname LIKE CONCAT('%', :searchString, '%')) " + + " ORDER BY " + + " CASE " + + " WHEN :sortBy='userName' THEN user.fullname " + + " WHEN :sortBy='total' THEN user.lastAttemptTotalMark " + + " END " + sortOrder; + + Query query = getSession().createQuery(LOAD_USERS); + query.setLong("sessionId", sessionId); + // support for custom search from a toolbar + searchString = searchString == null ? "" : searchString; + query.setString("searchString", searchString); + query.setString("sortBy", sortBy); + query.setFirstResult(page * size); + query.setMaxResults(size); + List list = query.list(); + + ArrayList userDtos = new ArrayList(); + if (list != null && list.size() > 0) { + for (Object[] element : list) { + + Long userId = ((Number) element[0]).longValue(); + String fullName = (String) element[1]; + Integer totalMark = element[2] == null ? 0 : ((Number) element[2]).intValue(); + + McUserMarkDTO userDto = new McUserMarkDTO(); + userDto.setQueUsrId(userId.toString()); + userDto.setFullName(fullName); + userDto.setTotalMark(new Long(totalMark)); + userDtos.add(userDto); + } + + } + + return userDtos; + } + + @Override + public int getCountPagedUsersBySession(Long sessionId, String searchString) { + + String LOAD_USERS_ORDERED_BY_NAME = "SELECT COUNT(*) FROM " + McQueUsr.class.getName() + " user" + + " WHERE user.mcSession.mcSessionId = :sessionId " + + " AND (user.fullname LIKE CONCAT('%', :searchString, '%')) "; + + Query query = getSession().createQuery(LOAD_USERS_ORDERED_BY_NAME); + query.setLong("sessionId", sessionId); + // support for custom search from a toolbar + searchString = searchString == null ? "" : searchString; + query.setString("searchString", searchString); + List list = query.list(); + + if ((list == null) || (list.size() == 0)) { + return 0; + } else { + return ((Number) list.get(0)).intValue(); + } + } + } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/SessionDTO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/SessionDTO.java,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dto/SessionDTO.java 5 Jan 2016 16:00:41 -0000 1.1 @@ -0,0 +1,26 @@ +package org.lamsfoundation.lams.tool.mc.dto; + +public class SessionDTO { + + private Long sessionId; + private String sessionName; + + public SessionDTO () { + } + + public Long getSessionId() { + return sessionId; + } + + public void setSessionId(Long sessionId) { + this.sessionId = sessionId; + } + + public String getSessionName() { + return sessionName; + } + + public void setSessionName(String sessionName) { + this.sessionName = sessionName; + } +} Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McContent.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McContent.java,v diff -u -r1.24 -r1.25 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McContent.java 17 May 2014 19:54:43 -0000 1.24 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McContent.java 5 Jan 2016 16:00:41 -0000 1.25 @@ -30,9 +30,6 @@ import java.util.TreeSet; import org.apache.commons.lang.builder.ToStringBuilder; -import org.lamsfoundation.lams.contentrepository.ItemNotFoundException; -import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException; -import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; /** *

Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java,v diff -u -r1.79 -r1.80 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java 30 Dec 2015 19:08:31 -0000 1.79 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java 5 Jan 2016 16:00:41 -0000 1.80 @@ -30,13 +30,13 @@ import org.lamsfoundation.lams.tool.IToolVO; import org.lamsfoundation.lams.tool.ToolSessionExportOutputData; import org.lamsfoundation.lams.tool.exception.DataMissingException; -import org.lamsfoundation.lams.tool.exception.SessionDataExistsException; import org.lamsfoundation.lams.tool.exception.ToolException; import org.lamsfoundation.lams.tool.mc.McApplicationException; -import org.lamsfoundation.lams.tool.mc.McOptionDTO; import org.lamsfoundation.lams.tool.mc.McLearnerAnswersDTO; +import org.lamsfoundation.lams.tool.mc.McOptionDTO; import org.lamsfoundation.lams.tool.mc.McQuestionDTO; import org.lamsfoundation.lams.tool.mc.McSessionMarkDTO; +import org.lamsfoundation.lams.tool.mc.McUserMarkDTO; import org.lamsfoundation.lams.tool.mc.ReflectionDTO; import org.lamsfoundation.lams.tool.mc.pojos.McContent; import org.lamsfoundation.lams.tool.mc.pojos.McOptsContent; @@ -106,7 +106,14 @@ McQueContent getQuestionByUid(Long uid); McQueUsr getMcUserByUID(Long uid) throws McApplicationException; + + List getPagedUsersBySession(Long sessionId, int page, int size, String sortBy, String sortOrder, + String searchString); + int getCountPagedUsersBySession(Long sessionId, String searchString); + + String getLocalizedMessage(String key); + List getQuestionsByContentUid(final Long mcContentId) throws McApplicationException; McSession getMcSessionById(Long mcSessionId) throws McApplicationException; @@ -175,7 +182,7 @@ List buildLearnerAnswersDTOList(McContent mcContent, McQueUsr user); /** - * Returns userMarksDtos grouped by sessions. + * Returns userMarksDtos grouped by sessions. Used *only* for export portfolio. * * @param mcContent * @param isFullAttemptDetailsRequired Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java,v diff -u -r1.136 -r1.137 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java 30 Dec 2015 19:08:31 -0000 1.136 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java 5 Jan 2016 16:00:41 -0000 1.137 @@ -416,8 +416,24 @@ "Exception occured when lams is getting the mc QueUsr by uid." + e.getMessage(), e); } } + + @Override + public List getPagedUsersBySession(Long sessionId, int page, int size, String sortBy, String sortOrder, + String searchString) { + return mcUserDAO.getPagedUsersBySession(sessionId, page, size, sortBy, sortOrder, searchString); + } @Override + public int getCountPagedUsersBySession(Long sessionId, String searchString) { + return mcUserDAO.getCountPagedUsersBySession(sessionId, searchString); + } + + @Override + public String getLocalizedMessage(String key) { + return messageService.getMessage(key); + } + + @Override public void saveUserAttempt(McQueUsr user, List selectedQuestionAndCandidateAnswersDTO) { Date attemptTime = new Date(System.currentTimeMillis()); Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java,v diff -u -r1.72 -r1.73 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java 9 Sep 2014 16:42:13 -0000 1.72 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java 5 Jan 2016 16:00:42 -0000 1.73 @@ -23,7 +23,6 @@ package org.lamsfoundation.lams.tool.mc.web; import java.util.Date; -import java.util.HashSet; import java.util.Iterator; import java.util.LinkedList; import java.util.List; @@ -45,7 +44,6 @@ import org.lamsfoundation.lams.tool.mc.pojos.McQueContent; import org.lamsfoundation.lams.tool.mc.service.IMcService; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; -import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java,v diff -u -r1.144 -r1.145 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java 9 Sep 2014 16:42:13 -0000 1.144 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java 5 Jan 2016 16:00:42 -0000 1.145 @@ -31,8 +31,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import java.util.TreeMap; -import java.util.TreeSet; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; @@ -53,15 +51,12 @@ import org.lamsfoundation.lams.questions.QuestionParser; import org.lamsfoundation.lams.tool.ToolAccessMode; import org.lamsfoundation.lams.tool.mc.McAppConstants; -import org.lamsfoundation.lams.tool.mc.McComparator; -import org.lamsfoundation.lams.tool.mc.McOptionDTO; import org.lamsfoundation.lams.tool.mc.McGeneralAuthoringDTO; +import org.lamsfoundation.lams.tool.mc.McOptionDTO; import org.lamsfoundation.lams.tool.mc.McQuestionDTO; import org.lamsfoundation.lams.tool.mc.McUtils; 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.McUsrAttempt; import org.lamsfoundation.lams.tool.mc.service.IMcService; import org.lamsfoundation.lams.tool.mc.service.McServiceProxy; import org.lamsfoundation.lams.util.WebUtil; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java,v diff -u -r1.83 -r1.84 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java 25 Jun 2015 20:36:04 -0000 1.83 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningAction.java 5 Jan 2016 16:00:42 -0000 1.84 @@ -31,7 +31,6 @@ import java.util.TreeMap; import java.util.regex.Pattern; -import javax.servlet.ServletContext; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java,v diff -u -r1.59 -r1.60 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java 9 Sep 2014 16:42:13 -0000 1.59 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java 5 Jan 2016 16:00:42 -0000 1.60 @@ -36,11 +36,15 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; +import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringUtils; 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.JSONArray; +import org.apache.tomcat.util.json.JSONException; +import org.apache.tomcat.util.json.JSONObject; import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.tool.exception.ToolException; @@ -49,10 +53,12 @@ import org.lamsfoundation.lams.tool.mc.McGeneralAuthoringDTO; import org.lamsfoundation.lams.tool.mc.McGeneralLearnerFlowDTO; import org.lamsfoundation.lams.tool.mc.McGeneralMonitoringDTO; +import org.lamsfoundation.lams.tool.mc.McUserMarkDTO; import org.lamsfoundation.lams.tool.mc.ReflectionDTO; import org.lamsfoundation.lams.tool.mc.pojos.McContent; 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; @@ -93,8 +99,6 @@ repopulateRequestParameters(request, mcMonitoringForm, mcGeneralMonitoringDTO); - String toolContentID = mcMonitoringForm.getToolContentID(); - // generate DTO for All sessions MonitoringUtil.setupAllSessionsData(request, mcContent, mcService); @@ -276,6 +280,69 @@ return (userAttempts == null || userAttempts.isEmpty()) ? null : mapping.findForward(McAppConstants.USER_MASTER_DETAIL); } + /** + * Return paged users for jqGrid. + */ + public ActionForward getPagedUsers(ActionMapping mapping, ActionForm form, HttpServletRequest request, + HttpServletResponse response) throws JSONException, IOException { + IMcService mcService = McServiceProxy.getMcService(getServlet().getServletContext()); + + Long sessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID); + McSession session = mcService.getMcSessionById(sessionId); + //find group leader, if any + McQueUsr groupLeader = session.getGroupLeader(); + + // Getting the params passed in from the jqGrid + int page = WebUtil.readIntParam(request, AttributeNames.PARAM_PAGE); + int rowLimit = WebUtil.readIntParam(request, AttributeNames.PARAM_ROWS); + String sortOrder = WebUtil.readStrParam(request, AttributeNames.PARAM_SORD); + String sortBy = WebUtil.readStrParam(request, AttributeNames.PARAM_SIDX, true); + if (sortBy == "") { + sortBy = "userName"; + } + String searchString = WebUtil.readStrParam(request, "userName", true); + + List userDtos = mcService.getPagedUsersBySession(sessionId, page - 1, rowLimit, sortBy, sortOrder, + searchString); + int countVisitLogs = mcService.getCountPagedUsersBySession(sessionId, searchString); + + int totalPages = new Double(Math.ceil(new Integer(countVisitLogs).doubleValue() + / new Integer(rowLimit).doubleValue())).intValue(); + + JSONArray rows = new JSONArray(); + int i = 1; + for (McUserMarkDTO userDto : userDtos) { + + JSONArray visitLogData = new JSONArray(); + Long userUid = Long.parseLong(userDto.getQueUsrId()); + visitLogData.put(userUid); + String fullName = StringEscapeUtils.escapeHtml(userDto.getFullName()); + if (groupLeader != null && groupLeader.getUid().equals(userUid)) { + fullName += " (" + mcService.getLocalizedMessage("label.monitoring.group.leader") + ")"; + } + + visitLogData.put(fullName); + Long totalMark = (userDto.getTotalMark() == null) ? 0 : userDto.getTotalMark(); + visitLogData.put(totalMark); + + JSONObject userRow = new JSONObject(); + userRow.put("id", i++); + userRow.put("cell", visitLogData); + + rows.put(userRow); + } + + JSONObject responseJSON = new JSONObject(); + responseJSON.put("total", totalPages); + responseJSON.put("page", page); + responseJSON.put("records", countVisitLogs); + responseJSON.put("rows", rows); + + response.setContentType("application/json;charset=utf-8"); + response.getWriter().write(responseJSON.toString()); + return null; + } + public ActionForward saveUserMark(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java,v diff -u -r1.53 -r1.54 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java 9 Sep 2014 16:42:13 -0000 1.53 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java 5 Jan 2016 16:00:42 -0000 1.54 @@ -25,9 +25,7 @@ import java.io.IOException; import java.util.LinkedList; import java.util.List; -import java.util.Map; import java.util.Set; -import java.util.TreeMap; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; @@ -40,7 +38,6 @@ import org.apache.struts.action.ActionMapping; import org.lamsfoundation.lams.tool.mc.McAppConstants; import org.lamsfoundation.lams.tool.mc.McApplicationException; -import org.lamsfoundation.lams.tool.mc.McComparator; import org.lamsfoundation.lams.tool.mc.McGeneralAuthoringDTO; import org.lamsfoundation.lams.tool.mc.McGeneralMonitoringDTO; import org.lamsfoundation.lams.tool.mc.McQuestionDTO; @@ -85,7 +82,7 @@ } McContent mcContent = service.getMcContent(new Long(toolContentID)); - mcGeneralMonitoringDTO.setToolContentID(toolContentID.toString()); + mcGeneralMonitoringDTO.setToolContentID(toolContentID); mcGeneralMonitoringDTO.setActivityTitle(mcContent.getTitle()); mcGeneralMonitoringDTO.setActivityInstructions(mcContent.getInstructions()); mcGeneralMonitoringDTO.setCurrentMonitoringTab("summary"); Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java,v diff -u -r1.100 -r1.101 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java 9 Sep 2014 16:42:13 -0000 1.100 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java 5 Jan 2016 16:00:42 -0000 1.101 @@ -26,10 +26,8 @@ import java.io.IOException; import java.util.ArrayList; -import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.TreeSet; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; @@ -51,8 +49,6 @@ import org.lamsfoundation.lams.tool.mc.McQuestionDTO; import org.lamsfoundation.lams.tool.mc.McUtils; 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.service.IMcService; import org.lamsfoundation.lams.tool.mc.service.McServiceProxy; import org.lamsfoundation.lams.util.WebUtil; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java,v diff -u -r1.43 -r1.44 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java 17 May 2014 19:54:42 -0000 1.43 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java 5 Jan 2016 16:00:42 -0000 1.44 @@ -30,25 +30,22 @@ import java.util.Set; import java.util.TimeZone; import java.util.TreeMap; +import java.util.TreeSet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; import org.apache.commons.lang.StringEscapeUtils; import org.lamsfoundation.lams.tool.mc.McAppConstants; -import org.lamsfoundation.lams.tool.mc.McOptionDTO; import org.lamsfoundation.lams.tool.mc.McGeneralMonitoringDTO; -import org.lamsfoundation.lams.tool.mc.McMonitoredAnswersDTO; -import org.lamsfoundation.lams.tool.mc.McMonitoredUserDTO; -import org.lamsfoundation.lams.tool.mc.McSessionMarkDTO; -import org.lamsfoundation.lams.tool.mc.McStringComparator; +import org.lamsfoundation.lams.tool.mc.dto.SessionDTO; 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.util.McSessionComparator; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.util.DateUtil; import org.lamsfoundation.lams.web.session.SessionManager; @@ -121,8 +118,19 @@ * @param mcService */ protected static void setupAllSessionsData(HttpServletRequest request, McContent content, IMcService mcService) { - List listMonitoredMarksContainerDTO = mcService.buildGroupsMarkData(content, false); - request.setAttribute(LIST_MONITORED_MARKS_CONTAINER_DTO, listMonitoredMarksContainerDTO); + + //set up sessionDTOs list + Set sessions = new TreeSet(new McSessionComparator()); + sessions.addAll(content.getMcSessions()); + List sessionDtos = new LinkedList(); + for (McSession session : sessions) { + SessionDTO sessionDto = new SessionDTO(); + sessionDto.setSessionId(session.getMcSessionId()); + sessionDto.setSessionName(session.getSession_name()); + + sessionDtos.add(sessionDto); + } + request.setAttribute(SESSION_DTOS, sessionDtos); request.setAttribute(HR_COLUMN_COUNT, new Integer(content.getMcQueContents().size() + 2).toString()); Index: lams_tool_lamc/web/monitoring/SummaryContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/monitoring/SummaryContent.jsp,v diff -u -r1.44 -r1.45 --- lams_tool_lamc/web/monitoring/SummaryContent.jsp 14 Oct 2015 23:10:53 -0000 1.44 +++ lams_tool_lamc/web/monitoring/SummaryContent.jsp 5 Jan 2016 16:00:42 -0000 1.45 @@ -35,36 +35,39 @@ -

+

+ +

+
- +
<%@ include file="parts/advanceQuestions.jsp"%> @@ -205,19 +205,20 @@ <%@ include file="masterDetailLoadUp.jsp"%> - +
- ${sessionMarkDto.sessionName} + ${sessionDto.sessionName}
-
+
+
-
+