Index: lams_tool_vote/conf/language/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/conf/language/Attic/ApplicationResources.properties,v
diff -u -r1.29 -r1.30
--- lams_tool_vote/conf/language/ApplicationResources.properties 16 May 2006 17:39:26 -0000 1.29
+++ lams_tool_vote/conf/language/ApplicationResources.properties 18 May 2006 10:21:19 -0000 1.30
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java,v
diff -u -r1.18 -r1.19
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java 18 May 2006 05:16:19 -0000 1.18
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java 18 May 2006 10:21:19 -0000 1.19
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java,v
diff -u -r1.17 -r1.18
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java 18 May 2006 05:16:19 -0000 1.17
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java 18 May 2006 10:21:19 -0000 1.18
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java,v
diff -u -r1.16 -r1.17
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java 17 May 2006 13:32:25 -0000 1.16
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java 18 May 2006 10:21:19 -0000 1.17
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/Attic/VoteMonitoringForm.java,v
diff -u -r1.5 -r1.6
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringForm.java 16 May 2006 17:39:26 -0000 1.5
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringForm.java 18 May 2006 10:21:19 -0000 1.6
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java,v
diff -u -r1.16 -r1.17
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java 16 May 2006 14:17:56 -0000 1.16
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java 18 May 2006 10:21:19 -0000 1.17
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/SummaryContent.jsp,v
diff -u -r1.13 -r1.14
--- lams_tool_vote/web/monitoring/SummaryContent.jsp 17 May 2006 18:00:31 -0000 1.13
+++ lams_tool_vote/web/monitoring/SummaryContent.jsp 18 May 2006 10:21:19 -0000 1.14
@@ -89,7 +89,23 @@
|
-
+
+
+
+
+
+
+
+
+
+
+
+
+
|
@@ -145,10 +161,40 @@
-
+
+
+
+ | |
+
+
+ | |
+
+
+
+
+
+
+
+ |
+
+ |
+
+
+
+ |
+
+ |
+
+
+ |
+
+
-
\ No newline at end of file
|