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.43 -r1.44 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java 18 Mar 2008 06:21:00 -0000 1.43 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java 12 May 2008 08:17:31 -0000 1.44 @@ -1054,7 +1054,7 @@ double total=MonitoringUtil.calculateTotal(mapVoteRatesContent); logger.debug("updated mapIndex: " + mapIndex); - double share=100d-total ; + double share=100-total ; logger.debug("share: " + share); logger.debug("totalStandardVotesCount: " + totalStandardVotesCount); @@ -1075,10 +1075,14 @@ } logger.debug("final share: " + share); - mapStandardNominationsContent.put(mapIndex.toString(), "Open Vote"); - mapStandardNominationsHTMLedContent.put(mapIndex.toString(), "Open Vote"); - mapStandardRatesContent.put(mapIndex.toString(), new Double(share).toString()); - mapStandardUserCount.put(mapIndex.toString(), new Integer(userEnteredVotesCount).toString()); + if(voteContent.isAllowText()) { + mapStandardNominationsContent.put(mapIndex.toString(), "Open Vote"); + mapStandardNominationsHTMLedContent.put(mapIndex.toString(), "Open Vote"); + } + + mapStandardRatesContent.put(mapIndex.toString(), new Double(share).toString()); + mapStandardUserCount.put(mapIndex.toString(), new Integer(userEnteredVotesCount).toString()); + /**following are needed just for proper iteration in the summary jsp*/ mapStandardQuestionUid.put(mapIndex.toString(),"1"); mapStandardToolSessionUid.put(mapIndex.toString(),"1"); Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java,v diff -u -r1.45 -r1.46 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java 26 Mar 2008 03:57:40 -0000 1.45 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java 12 May 2008 08:17:32 -0000 1.46 @@ -812,7 +812,7 @@ IVoteService voteService = VoteServiceProxy.getVoteService(getServlet().getServletContext()); logger.debug("retrieving voteService from session: " + voteService); - repopulateRequestParameters(request,voteLearningForm); + repopulateRequestParameters(request, voteLearningForm); String toolSessionID=request.getParameter(TOOL_SESSION_ID); logger.debug("toolSessionID: " + toolSessionID); Index: lams_tool_vote/web/learning/AllNominations.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/AllNominations.jsp,v diff -u -r1.38 -r1.39 --- lams_tool_vote/web/learning/AllNominations.jsp 30 Apr 2008 03:00:45 -0000 1.38 +++ lams_tool_vote/web/learning/AllNominations.jsp 12 May 2008 08:17:32 -0000 1.39 @@ -75,7 +75,7 @@

- AN +