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.19 -r1.20 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java 19 May 2006 11:36:02 -0000 1.19 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java 21 May 2006 10:10:13 -0000 1.20 @@ -678,15 +678,23 @@ logger.debug("potentialUserCount: " + potentialUserCount); voteMonitoringForm.setSessionUserCount(Integer.toString(potentialUserCount)); voteMonitoringForm.setCompletedSessionUserCount(new Integer(completedSessionUserCount).toString()); + + if (potentialUserCount != 0) + { + double completedPercent=(completedSessionUserCount*100) / potentialUserCount; + logger.debug("completed percent: " + completedPercent); + voteMonitoringForm.setCompletedSessionUserPercent(new Double(completedPercent).toString()); + } + else + { + voteMonitoringForm.setCompletedSessionUserPercent("Not Available"); + } } } else { sessionLevelCharting=false; logger.debug("process for content: "); - //entriesCount=voteService.getAllEntriesCount(); - //userEntries=voteService.getUserEntries(); - //entriesCount=voteService.getContentEntriesCount(voteContent.getUid()); userEntries=voteService.getContentEntries(voteContent.getUid()); entriesCount=userEntries.size(); } @@ -772,80 +780,6 @@ mapStandardRatesContent.put(mapIndex.toString(), new Double(share).toString()); mapStandardUserCount.put(mapIndex.toString(), new Integer(userEnteredVotesCount).toString()); - /* - - double totalUserRate=0d; - while (itListQuestions.hasNext()) - { - String userEntry =(String)itListQuestions.next(); - logger.debug("userEntry:..." + userEntry); - - if ((userEntry != null) && (userEntry.length() > 0)) - { - int userEntryRate=0; - if (sessionLevelCharting == true) - { - logger.debug("getting total for userEntryRate based on session: " + toolSessionUid); - userEntryRate=voteService.getSessionUserRecordsEntryCount(userEntry, toolSessionUid,voteService); - } - else - { - logger.debug("getting total for userEntryRate based on content: "); - userEntryRate=voteService.getUserRecordsEntryCount(userEntry); - } - - logger.debug("userEntryRate: " + userEntryRate); - totalUserRate=totalUserRate + userEntryRate; - } - } - logger.debug("totalUserRate: " + totalUserRate); - - - itListQuestions = userEntries.iterator(); - while (itListQuestions.hasNext()) - { - String userEntry =(String)itListQuestions.next(); - logger.debug("userEntry:..." + userEntry); - logger.debug("mapIndex: " + mapIndex); - - if ((userEntry != null) && (userEntry.length() > 0)) - { - - int userEntryRate=0; - if (sessionLevelCharting == true) - { - logger.debug("getting userEntryRate based on session: " + toolSessionUid); - userEntryRate=voteService.getSessionUserRecordsEntryCount(userEntry, toolSessionUid,voteService); - } - else - { - logger.debug("getting userEntryRate based on session: " + toolSessionUid); - userEntryRate=voteService.getUserRecordsEntryCount(userEntry); - } - logger.debug("userEntryRate: " + userEntryRate); - - double votesShare= (userEntryRate * share) / totalUserRate ; - logger.debug("votesShare: " + votesShare); - - mapVoteRatesContent.put(mapIndex.toString(), new Double(votesShare).toString()); - - mapOptionsContent.put(mapIndex.toString() ,userEntry); - mapIndex=new Long(mapIndex.longValue()+1); - } - } - - */ - - - /* - logger.debug("Map initialized with mapVoteRatesContent: " + mapVoteRatesContent); - request.getSession().setAttribute(MAP_VOTERATES_CONTENT, mapVoteRatesContent); - logger.debug("starter initialized the MAP_VOTERATES_CONTENT Map: " + request.getSession().getAttribute(MAP_VOTERATES_CONTENT)); - - request.getSession().setAttribute(MAP_OPTIONS_CONTENT, mapOptionsContent); - logger.debug("final starter initialized the MAP_OPTIONS_CONTENT Map: " + request.getSession().getAttribute(MAP_OPTIONS_CONTENT) ); - */ - request.getSession().setAttribute(MAP_STANDARD_NOMINATIONS_CONTENT, mapStandardNominationsContent); logger.debug("test2: MAP_STANDARD_NOMINATIONS_CONTENT: " + request.getSession().getAttribute(MAP_STANDARD_NOMINATIONS_CONTENT)); 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.7 -r1.8 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringForm.java 18 May 2006 17:52:10 -0000 1.7 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringForm.java 21 May 2006 10:10:13 -0000 1.8 @@ -42,6 +42,8 @@ protected String completedSessionUserCount; + protected String completedSessionUserPercent; + protected String viewOpenVotes; protected String showOpenVotesSection; @@ -190,4 +192,17 @@ public void setShowOpenVote(String showOpenVote) { this.showOpenVote = showOpenVote; } + /** + * @return Returns the completedSessionUserPercent. + */ + public String getCompletedSessionUserPercent() { + return completedSessionUserPercent; + } + /** + * @param completedSessionUserPercent The completedSessionUserPercent to set. + */ + public void setCompletedSessionUserPercent( + String completedSessionUserPercent) { + this.completedSessionUserPercent = completedSessionUserPercent; + } } Index: lams_tool_vote/web/learning/AllNominations.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/AllNominations.jsp,v diff -u -r1.9 -r1.10 --- lams_tool_vote/web/learning/AllNominations.jsp 19 May 2006 20:23:44 -0000 1.9 +++ lams_tool_vote/web/learning/AllNominations.jsp 21 May 2006 10:10:13 -0000 1.10 @@ -30,7 +30,6 @@ - @@ -41,10 +40,10 @@ - +
- @@ -88,8 +87,8 @@ - Index: lams_tool_vote/web/learning/AnswersContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/AnswersContent.jsp,v diff -u -r1.11 -r1.12 --- lams_tool_vote/web/learning/AnswersContent.jsp 15 May 2006 22:42:12 -0000 1.11 +++ lams_tool_vote/web/learning/AnswersContent.jsp 21 May 2006 10:10:13 -0000 1.12 @@ -30,7 +30,6 @@ - @@ -41,7 +40,7 @@ -
- + +
- + +
+
-
@@ -149,7 +148,7 @@
+ : Index: lams_tool_vote/web/learning/ExitLearning.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/ExitLearning.jsp,v diff -u -r1.2 -r1.3 --- lams_tool_vote/web/learning/ExitLearning.jsp 29 Apr 2006 13:57:56 -0000 1.2 +++ lams_tool_vote/web/learning/ExitLearning.jsp 21 May 2006 10:10:13 -0000 1.3 @@ -10,7 +10,6 @@ - @@ -21,10 +20,10 @@ - +
- @@ -35,8 +34,8 @@ - Index: lams_tool_vote/web/learning/IndividualLearnerResults.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/IndividualLearnerResults.jsp,v diff -u -r1.9 -r1.10 --- lams_tool_vote/web/learning/IndividualLearnerResults.jsp 17 May 2006 13:32:25 -0000 1.9 +++ lams_tool_vote/web/learning/IndividualLearnerResults.jsp 21 May 2006 10:10:13 -0000 1.10 @@ -10,7 +10,6 @@ - @@ -21,11 +20,11 @@ -
- + +
- + +
+
- Index: lams_tool_vote/web/learning/Preview.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/Attic/Preview.jsp,v diff -u -r1.3 -r1.4 --- lams_tool_vote/web/learning/Preview.jsp 27 Apr 2006 12:21:50 -0000 1.3 +++ lams_tool_vote/web/learning/Preview.jsp 21 May 2006 10:10:13 -0000 1.4 @@ -30,7 +30,7 @@ - + @@ -41,16 +41,15 @@ -
- + +
- +
- - Index: lams_tool_vote/web/learning/learningHeader.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/Attic/learningHeader.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_vote/web/learning/learningHeader.jsp 22 Apr 2006 11:33:16 -0000 1.1 +++ lams_tool_vote/web/learning/learningHeader.jsp 21 May 2006 10:10:13 -0000 1.2 @@ -30,8 +30,11 @@ - - + + + <%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %> + + <bean:message key="label.learning"/> Index: lams_tool_vote/web/monitoring/SummaryStatsCommon.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/Attic/SummaryStatsCommon.jsp,v diff -u -r1.2 -r1.3 --- lams_tool_vote/web/monitoring/SummaryStatsCommon.jsp 19 May 2006 20:23:44 -0000 1.2 +++ lams_tool_vote/web/monitoring/SummaryStatsCommon.jsp 21 May 2006 10:10:13 -0000 1.3 @@ -63,7 +63,9 @@ - + @@ -162,20 +164,22 @@ + + + + + + + + + +
+
+
+  ( ) +
- - - - - - - -