Index: lams_tool_vote/conf/language/ApplicationResources.properties =================================================================== diff -u -ra178ed11c7cc66dbfbff48645b8c6cc33eb2dbf8 -r9b9b31de09cd2c5a5594ae149ca63b209cd602c3 --- lams_tool_vote/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision a178ed11c7cc66dbfbff48645b8c6cc33eb2dbf8) +++ lams_tool_vote/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision 9b9b31de09cd2c5a5594ae149ca63b209cd602c3) @@ -102,12 +102,15 @@ label.learner.progress =Learner Progress Report error.system.vote =A system exception has occured. Please contact Lams International technical support at 95806666. The error to report is\:
{0} error.duplicate.nomination =Please correct this: You have entered the same nomination more than once. -label.total.students =Total number of students in class: +label.total.students =Total number of possibly students: label.total.completed.students =Total number of students that completed voting: -label.open.vote =Open vote +label.open.vote =Open Vote label.total.votes =Total votes label.select.session =Please select a group to view class votes summary label.percent =% +label.view.openVotes =View Open Votes +label.view.closeVotes =Close Open Votes +label.openVotes =Open Votes #======= End labels: Exported 96 labels for en AU ===== Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java =================================================================== diff -u -r99dfa3c71ae1855a7146b540358c474c6d88316d -r9b9b31de09cd2c5a5594ae149ca63b209cd602c3 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java (.../VoteServicePOJO.java) (revision 99dfa3c71ae1855a7146b540358c474c6d88316d) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java (.../VoteServicePOJO.java) (revision 9b9b31de09cd2c5a5594ae149ca63b209cd602c3) @@ -417,7 +417,7 @@ { try { - Set potentialLearners = toolService.getAllPotentialLearners(voteSessionId); + Set potentialLearners = toolService.getAllPotentialLearners(voteSessionId.longValue()); return potentialLearners != null ? potentialLearners.size() : 0; } catch (LamsToolServiceException e) Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java =================================================================== diff -u -r99dfa3c71ae1855a7146b540358c474c6d88316d -r9b9b31de09cd2c5a5594ae149ca63b209cd602c3 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java (.../MonitoringUtil.java) (revision 99dfa3c71ae1855a7146b540358c474c6d88316d) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java (.../MonitoringUtil.java) (revision 9b9b31de09cd2c5a5594ae149ca63b209cd602c3) @@ -660,6 +660,10 @@ userEntries=voteService.getSessionUserEntries(toolSessionUid); logger.debug("sessionUserCount: " + userEntries.size()); + // this was replaced by voteService.getVoteSessionPotentialLearnersCount(toolSessionUid) + //distinctSessionUsers=voteService.getVoteUserBySessionUid(toolSessionUid); + //logger.debug("distinctSessionUsers: " + distinctSessionUsers); + int completedSessionUserCount=voteService.getCompletedVoteUserBySessionUid(toolSessionUid); logger.debug("completedSessionUserCount: " + completedSessionUserCount); @@ -669,7 +673,9 @@ if (voteMonitoringForm != null) { - voteMonitoringForm.setSessionUserCount(Integer.toString(voteService.getVoteSessionPotentialLearnersCount(toolSessionUid))); + int potentialUserCount=voteService.getVoteSessionPotentialLearnersCount(toolSessionUid); + logger.debug("potentialUserCount: " + potentialUserCount); + voteMonitoringForm.setSessionUserCount(Integer.toString(potentialUserCount)); voteMonitoringForm.setCompletedSessionUserCount(new Integer(completedSessionUserCount).toString()); } } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java =================================================================== diff -u -rc8f1ea88d18b9b6b1ee0002d299ac9bfb1431d84 -r9b9b31de09cd2c5a5594ae149ca63b209cd602c3 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java (.../VoteMonitoringAction.java) (revision c8f1ea88d18b9b6b1ee0002d299ac9bfb1431d84) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java (.../VoteMonitoringAction.java) (revision 9b9b31de09cd2c5a5594ae149ca63b209cd602c3) @@ -769,7 +769,60 @@ return null; } + + public ActionForward viewOpenVotes(ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response) throws IOException, + ServletException, ToolException + { + logger.debug("dispatching viewOpenVotes..."); + IVoteService voteService=null; + voteService = (IVoteService)request.getSession().getAttribute(TOOL_SERVICE); + + if (voteService == null) + { + logger.debug("will retrieve voteService"); + voteService = VoteServiceProxy.getVoteService(getServlet().getServletContext()); + } + logger.debug("voteService: " + voteService); + + VoteMonitoringForm voteMonitoringForm = (VoteMonitoringForm) form; + voteMonitoringForm.setShowOpenVotesSection(new Boolean(true).toString()); + + logger.debug("showOpen votes set to true: "); + + + return (mapping.findForward(LOAD_MONITORING)); + } + + public ActionForward closeOpenVotes(ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response) throws IOException, + ServletException, ToolException + { + logger.debug("dispatching closeOpenVotes..."); + IVoteService voteService=null; + voteService = (IVoteService)request.getSession().getAttribute(TOOL_SERVICE); + + if (voteService == null) + { + logger.debug("will retrieve voteService"); + voteService = VoteServiceProxy.getVoteService(getServlet().getServletContext()); + } + logger.debug("voteService: " + voteService); + + VoteMonitoringForm voteMonitoringForm = (VoteMonitoringForm) form; + voteMonitoringForm.setShowOpenVotesSection(new Boolean(false).toString()); + + logger.debug("showOpen votes set to true: "); + + + return (mapping.findForward(LOAD_MONITORING)); + } + /** * persists error messages to request scope Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringForm.java =================================================================== diff -u -ra178ed11c7cc66dbfbff48645b8c6cc33eb2dbf8 -r9b9b31de09cd2c5a5594ae149ca63b209cd602c3 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringForm.java (.../VoteMonitoringForm.java) (revision a178ed11c7cc66dbfbff48645b8c6cc33eb2dbf8) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringForm.java (.../VoteMonitoringForm.java) (revision 9b9b31de09cd2c5a5594ae149ca63b209cd602c3) @@ -42,8 +42,38 @@ protected String completedSessionUserCount; + protected String viewOpenVotes; + protected String showOpenVotesSection; + protected String closeOpenVotes; + + + + /** + * @return Returns the closeOpenVotes. + */ + public String getCloseOpenVotes() { + return closeOpenVotes; + } + /** + * @param closeOpenVotes The closeOpenVotes to set. + */ + public void setCloseOpenVotes(String closeOpenVotes) { + this.closeOpenVotes = closeOpenVotes; + } + /** + * @return Returns the viewOpenVotes. + */ + public String getViewOpenVotes() { + return viewOpenVotes; + } + /** + * @param viewOpenVotes The viewOpenVotes to set. + */ + public void setViewOpenVotes(String viewOpenVotes) { + this.viewOpenVotes = viewOpenVotes; + } /** * @return Returns the isToolSessionChanged. */ @@ -106,4 +136,16 @@ public void setSessionUserCount(String sessionUserCount) { this.sessionUserCount = sessionUserCount; } + /** + * @return Returns the showOpenVotesSection. + */ + public String getShowOpenVotesSection() { + return showOpenVotesSection; + } + /** + * @param showOpenVotesSection The showOpenVotesSection to set. + */ + public void setShowOpenVotesSection(String showOpenVotesSection) { + this.showOpenVotesSection = showOpenVotesSection; + } } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java =================================================================== diff -u -r7e1e8414045a6435bbd09cb35b0058b1573389b2 -r9b9b31de09cd2c5a5594ae149ca63b209cd602c3 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java (.../VoteMonitoringStarterAction.java) (revision 7e1e8414045a6435bbd09cb35b0058b1573389b2) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java (.../VoteMonitoringStarterAction.java) (revision 9b9b31de09cd2c5a5594ae149ca63b209cd602c3) @@ -122,6 +122,7 @@ voteMonitoringForm.setSelectedToolSessionId("All"); voteMonitoringForm.setSbmtSuccess(new Boolean(false).toString()); request.getSession().setAttribute(REQUEST_LEARNING_REPORT, new Boolean(false).toString()); + voteMonitoringForm.setShowOpenVotesSection(new Boolean(false).toString()); return voteMonitoringAction.submitSession(mapping, form, request, response); } Index: lams_tool_vote/web/monitoring/SummaryContent.jsp =================================================================== diff -u -r303e5cc62f0e45b9b9b212ab55b244ed4924b41a -r9b9b31de09cd2c5a5594ae149ca63b209cd602c3 --- lams_tool_vote/web/monitoring/SummaryContent.jsp (.../SummaryContent.jsp) (revision 303e5cc62f0e45b9b9b212ab55b244ed4924b41a) +++ lams_tool_vote/web/monitoring/SummaryContent.jsp (.../SummaryContent.jsp) (revision 9b9b31de09cd2c5a5594ae149ca63b209cd602c3) @@ -89,7 +89,23 @@ - +   + + + + + + + + + + + + @@ -145,10 +161,40 @@ - + + + +    + + +    + + + + + + + + + + + + + + +
+ +
+ + + +
+ + + +
- \ No newline at end of file