Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteUsrAttemptDAO.java =================================================================== diff -u -re8bdd364f7372b39f60efbd8cdbb114e7955e9a2 -re6d4c9ba0ba0e2b42b4ff2f997618bfedc28dd7c --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteUsrAttemptDAO.java (.../IVoteUsrAttemptDAO.java) (revision e8bdd364f7372b39f60efbd8cdbb114e7955e9a2) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteUsrAttemptDAO.java (.../IVoteUsrAttemptDAO.java) (revision e6d4c9ba0ba0e2b42b4ff2f997618bfedc28dd7c) @@ -41,6 +41,8 @@ public List getAttemptsForUser(final Long queUsrId); + public List getUserRecords(final String userEntry); + public List getUserEntries(); public void removeAttemptsForUser(final Long queUsrId); Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java =================================================================== diff -u -re8bdd364f7372b39f60efbd8cdbb114e7955e9a2 -re6d4c9ba0ba0e2b42b4ff2f997618bfedc28dd7c --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java (.../VoteUsrAttemptDAO.java) (revision e8bdd364f7372b39f60efbd8cdbb114e7955e9a2) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java (.../VoteUsrAttemptDAO.java) (revision e6d4c9ba0ba0e2b42b4ff2f997618bfedc28dd7c) @@ -50,6 +50,8 @@ private static final String LOAD_ATTEMPT_FOR_USER_AND_QUESTION_CONTENT = "from voteUsrAttempt in class VoteUsrAttempt where voteUsrAttempt.queUsrId=:queUsrId and voteUsrAttempt.voteQueContentId=:voteQueContentId"; private static final String LOAD_USER_ENTRIES = "select distinct voteUsrAttempt.userEntry from VoteUsrAttempt voteUsrAttempt"; + + private static final String LOAD_USER_ENTRY_RECORDS = "from voteUsrAttempt in class VoteUsrAttempt where voteUsrAttempt.userEntry=:userEntry and voteUsrAttempt.voteQueContentId=1 "; public VoteUsrAttempt getVoteUserAttemptByUID(Long uid) @@ -155,7 +157,17 @@ return list; } + + public List getUserRecords(final String userEntry) + { + HibernateTemplate templ = this.getHibernateTemplate(); + List list = getSession().createQuery(LOAD_USER_ENTRY_RECORDS) + .setString("userEntry", userEntry) + .list(); + return list; + } + public void updateVoteUsrAttempt(VoteUsrAttempt voteUsrAttempt) { this.getHibernateTemplate().update(voteUsrAttempt); Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java =================================================================== diff -u -re8bdd364f7372b39f60efbd8cdbb114e7955e9a2 -re6d4c9ba0ba0e2b42b4ff2f997618bfedc28dd7c --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java (.../IVoteService.java) (revision e8bdd364f7372b39f60efbd8cdbb114e7955e9a2) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java (.../IVoteService.java) (revision e6d4c9ba0ba0e2b42b4ff2f997618bfedc28dd7c) @@ -76,6 +76,8 @@ public void updateVoteUsrAttempt(VoteUsrAttempt mcUsrAttempt) throws VoteApplicationException; + public List getUserRecords(final String userEntry) throws VoteApplicationException; + public List getUserBySessionOnly(final VoteSession voteSession) throws VoteApplicationException; public void updateVoteQueContent(VoteQueContent voteQueContent) throws VoteApplicationException; Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java =================================================================== diff -u -re8bdd364f7372b39f60efbd8cdbb114e7955e9a2 -re6d4c9ba0ba0e2b42b4ff2f997618bfedc28dd7c --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java (.../VoteServicePOJO.java) (revision e8bdd364f7372b39f60efbd8cdbb114e7955e9a2) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java (.../VoteServicePOJO.java) (revision e6d4c9ba0ba0e2b42b4ff2f997618bfedc28dd7c) @@ -469,6 +469,21 @@ } } + + public List getUserRecords(final String userEntry) throws VoteApplicationException + { + try + { + return voteUsrAttemptDAO.getUserRecords(userEntry); + } + catch (DataAccessException e) + { + throw new VoteApplicationException("Exception occured when lams is getting user records for user entry: " + + e.getMessage(), + e); + } + } + public List getAttemptsListForUserAndQuestionContent(final Long queUsrId, final Long voteQueContentId) throws VoteApplicationException { Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java =================================================================== diff -u -re8bdd364f7372b39f60efbd8cdbb114e7955e9a2 -re6d4c9ba0ba0e2b42b4ff2f997618bfedc28dd7c --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java (.../VoteMonitoringAction.java) (revision e8bdd364f7372b39f60efbd8cdbb114e7955e9a2) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java (.../VoteMonitoringAction.java) (revision e6d4c9ba0ba0e2b42b4ff2f997618bfedc28dd7c) @@ -43,9 +43,9 @@ import org.lamsfoundation.lams.tool.vote.VoteAppConstants; import org.lamsfoundation.lams.tool.vote.VoteApplicationException; import org.lamsfoundation.lams.tool.vote.VoteMonitoredAnswersDTO; +import org.lamsfoundation.lams.tool.vote.VoteMonitoredUserDTO; import org.lamsfoundation.lams.tool.vote.VoteUtils; import org.lamsfoundation.lams.tool.vote.pojos.VoteContent; -import org.lamsfoundation.lams.tool.vote.pojos.VoteQueContent; import org.lamsfoundation.lams.tool.vote.pojos.VoteUsrAttempt; import org.lamsfoundation.lams.tool.vote.service.IVoteService; import org.lamsfoundation.lams.tool.vote.service.VoteServiceProxy; @@ -171,6 +171,14 @@ logger.debug("LIST_MONITORED_ANSWERS_CONTAINER_DTO: " + request.getSession().getAttribute(LIST_MONITORED_ANSWERS_CONTAINER_DTO)); /* ends here. */ + List listUserEntries=processUserEnteredNominations(voteService); + logger.debug("listUserEntries: " + listUserEntries); + request.getSession().setAttribute(LIST_USER_ENTRIES, listUserEntries); + } + + + public List processUserEnteredNominations(IVoteService voteService) + { logger.debug("start getting user entries: "); List userEntries=voteService.getUserEntries(); logger.debug("userEntries: " + userEntries); @@ -186,19 +194,46 @@ if (userEntry != null) { VoteMonitoredAnswersDTO voteMonitoredAnswersDTO= new VoteMonitoredAnswersDTO(); - logger.debug("adding uwer entry : " + userEntry); + logger.debug("adding user entry : " + userEntry); voteMonitoredAnswersDTO.setQuestion(userEntry); + List userRecords=voteService.getUserRecords(userEntry); + logger.debug("userRecords: " + userRecords); + + logger.debug("start processing user records: "); + + List listMonitoredUserContainerDTO= new LinkedList(); + + Iterator itUserRecords= userRecords.iterator(); + while (itUserRecords.hasNext()) + { + VoteMonitoredUserDTO voteMonitoredUserDTO = new VoteMonitoredUserDTO(); + logger.debug("new DTO created"); + VoteUsrAttempt voteUsrAttempt =(VoteUsrAttempt)itUserRecords.next(); + logger.debug("voteUsrAttempt: " + voteUsrAttempt); + voteMonitoredUserDTO.setAttemptTime(voteUsrAttempt.getAttemptTime().toString()); + voteMonitoredUserDTO.setTimeZone(voteUsrAttempt.getTimeZone()); + voteMonitoredUserDTO.setUserName(voteUsrAttempt.getVoteQueUsr().getUsername()); + voteMonitoredUserDTO.setQueUsrId(voteUsrAttempt.getVoteQueUsr().getUid().toString()); + voteMonitoredUserDTO.setUserEntry(voteUsrAttempt.getUserEntry()); + + logger.debug("adding user entry: " + voteUsrAttempt.getUserEntry()); + listMonitoredUserContainerDTO.add(voteMonitoredUserDTO); + } + + logger.debug("final listMonitoredUserContainerDTO: " + listMonitoredUserContainerDTO); + Map mapMonitoredUserContainerDTO=MonitoringUtil.convertToVoteMonitoredUserDTOMap(listMonitoredUserContainerDTO); + logger.debug("final user entry mapMonitoredUserContainerDTO:..." + mapMonitoredUserContainerDTO); + + voteMonitoredAnswersDTO.setQuestionAttempts(mapMonitoredUserContainerDTO); listUserEntries.add(voteMonitoredAnswersDTO); } } logger.debug("finish getting user entries: " + listUserEntries); - request.getSession().setAttribute(LIST_USER_ENTRIES, listUserEntries); - + return listUserEntries; } - - + public void initSummaryContent(ActionMapping mapping, ActionForm form, HttpServletRequest request, Index: lams_tool_vote/web/monitoring/SummaryContent.jsp =================================================================== diff -u -re8bdd364f7372b39f60efbd8cdbb114e7955e9a2 -re6d4c9ba0ba0e2b42b4ff2f997618bfedc28dd7c --- lams_tool_vote/web/monitoring/SummaryContent.jsp (.../SummaryContent.jsp) (revision e8bdd364f7372b39f60efbd8cdbb114e7955e9a2) +++ lams_tool_vote/web/monitoring/SummaryContent.jsp (.../SummaryContent.jsp) (revision e6d4c9ba0ba0e2b42b4ff2f997618bfedc28dd7c) @@ -124,7 +124,8 @@ - + + @@ -146,20 +147,16 @@ - - other data1 - other data2 - other data3 - + + + + + - - - -