Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java =================================================================== diff -u -r29bab925f2d52a03638949fa5f1e7f08a0767100 -r5b769706d761b4bd00911b062a4b01061ef2c506 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java (.../MonitoringUtil.java) (revision 29bab925f2d52a03638949fa5f1e7f08a0767100) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java (.../MonitoringUtil.java) (revision 5b769706d761b4bd00911b062a4b01061ef2c506) @@ -1043,7 +1043,6 @@ if (voteQueContent != null) { logger.debug("question: " + voteQueContent.getQuestion()); - //mapOptionsContent.put(mapIndex.toString(),voteQueContent.getQuestion()); String noHTMLNomination = VoteUtils.stripFCKTags(voteQueContent.getQuestion()); logger.debug("noHTMLNomination: " + noHTMLNomination); mapOptionsContent.put(mapIndex.toString(),noHTMLNomination); @@ -1123,15 +1122,22 @@ boolean isVoteVisible=voteService.isVoteVisibleForSession(userEntry, toolSessionUid); logger.debug("isVoteVisible: " + isVoteVisible); - logger.debug("voteEntries: " + voteEntries); int individualUserEnteredVoteCount=voteEntries.size(); logger.debug("individualUserEnteredVoteCount: " + individualUserEnteredVoteCount); double votesShare=(individualUserEnteredVoteCount * share) / userEnteredVotesCount; logger.debug("votesShare: " + votesShare); - mapStandardNominationsContent.put(mapIndex.toString(), userEntry); + if (isVoteVisible == true) + mapStandardNominationsContent.put(mapIndex.toString(), userEntry); + else + { + String nominationName="Nomination" + mapIndex + " Hidden"; + logger.debug("nominationName: " + nominationName); + mapStandardNominationsContent.put(mapIndex.toString(), nominationName); + } + mapStandardRatesContent.put(mapIndex.toString(), new Double(votesShare).toString()); mapStandardUserCount.put(mapIndex.toString(), new Integer(individualUserEnteredVoteCount).toString()); mapStandardNominationsVisibility.put(mapIndex.toString(), new Boolean(isVoteVisible).toString()); Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java =================================================================== diff -u -r35f1843c3f562fb2e648e7b2c55565cc38ea990a -r5b769706d761b4bd00911b062a4b01061ef2c506 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java (.../VoteMonitoringAction.java) (revision 35f1843c3f562fb2e648e7b2c55565cc38ea990a) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java (.../VoteMonitoringAction.java) (revision 5b769706d761b4bd00911b062a4b01061ef2c506) @@ -317,7 +317,7 @@ } else { - logger.debug("showUserEntriesBySession is true"); + logger.debug("showUserEntriesBySession is true: the case with learner export portfolio"); logger.debug("show user entries by same content and same session and same user"); String userSessionId=voteUsrAttempt.getVoteQueUsr().getVoteSession().getVoteSessionId().toString() ; logger.debug("userSessionId versus currentSessionId: " + userSessionId + " versus " + currentSessionId); @@ -340,7 +340,15 @@ voteMonitoredUserDTO.setUserEntry(voteUsrAttempt.getUserEntry()); listMonitoredUserContainerDTO.add(voteMonitoredUserDTO); voteMonitoredUserDTO.setUid(voteUsrAttempt.getUid().toString()); - voteMonitoredUserDTO.setVisible(new Boolean(voteUsrAttempt.isVisible()).toString()); + voteMonitoredUserDTO.setVisible(new Boolean(voteUsrAttempt.isVisible()).toString()); + logger.debug("overriding the nomination text with 'Nomination Hidden' if needed"); + logger.debug("is entry visible: " + voteUsrAttempt.isVisible()); + if (voteUsrAttempt.isVisible() == false) + { + voteMonitoredAnswersDTO.setQuestion("Nomination Hidden"); + logger.debug("overwrote the nomination text"); + } + } } } @@ -966,7 +974,8 @@ voteUsrAttempt.setVisible(true); voteService.updateVoteUsrAttempt(voteUsrAttempt); voteService.showOpenVote(voteUsrAttempt); - + logger.debug("voteUsrAttempt: " + voteUsrAttempt); + Long toolContentId =(Long) request.getSession().getAttribute(TOOL_CONTENT_ID); logger.debug("toolContentId: " + toolContentId);