Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java =================================================================== diff -u -r578183182c3aa8d836f7c4ff61886137fb71bcf2 -rd6f1b9ea567d6225a053285defd0df36a0fee2f0 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java (.../VoteLearningStarterAction.java) (revision 578183182c3aa8d836f7c4ff61886137fb71bcf2) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java (.../VoteLearningStarterAction.java) (revision d6f1b9ea567d6225a053285defd0df36a0fee2f0) @@ -40,7 +40,6 @@ import org.apache.struts.action.ActionMapping; import org.apache.struts.action.ActionMessage; import org.apache.struts.action.ActionMessages; -import org.lamsfoundation.lams.tool.exception.ToolException; import org.lamsfoundation.lams.tool.vote.VoteAppConstants; import org.lamsfoundation.lams.tool.vote.VoteApplicationException; import org.lamsfoundation.lams.tool.vote.VoteComparator; @@ -394,7 +393,6 @@ { VoteLearningAction voteLearningAction= new VoteLearningAction(); logger.debug("present to teacher learners progress..."); - //return voteLearningAction.viewAnswers(mapping, form, request, response); return null; } return (mapping.findForward(LOAD_LEARNER)); Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java =================================================================== diff -u -r578183182c3aa8d836f7c4ff61886137fb71bcf2 -rd6f1b9ea567d6225a053285defd0df36a0fee2f0 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java (.../VoteMonitoringAction.java) (revision 578183182c3aa8d836f7c4ff61886137fb71bcf2) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java (.../VoteMonitoringAction.java) (revision d6f1b9ea567d6225a053285defd0df36a0fee2f0) @@ -309,13 +309,13 @@ VoteSession localUserSession=voteUsrAttempt.getVoteQueUsr().getVoteSession(); logger.debug("localUserSession: " + localUserSession); logger.debug("localUserSession's content id: " + localUserSession.getVoteContentId()); - logger.debug("incoming content id versus localUserSession's content id: " + voteContent.getVoteContentId() + " versus " + localUserSession.getVoteContentId()); + logger.debug("incoming content uid versus localUserSession's content id: " + voteContent.getUid() + " versus " + localUserSession.getVoteContentId()); if (showUserEntriesBySession == false) { logger.debug("showUserEntriesBySession is false"); logger.debug("show user entries by same content only"); - if (voteContent.getVoteContentId().toString().equals(localUserSession.getVoteContentId().toString())) + if (voteContent.getUid().toString().equals(localUserSession.getVoteContentId().toString())) { voteMonitoredUserDTO.setAttemptTime(voteUsrAttempt.getAttemptTime().toString()); voteMonitoredUserDTO.setTimeZone(voteUsrAttempt.getTimeZone()); @@ -336,7 +336,7 @@ if (showUserEntriesByUserId == true) { - if (voteContent.getVoteContentId().toString().equals(localUserSession.getVoteContentId().toString())) + if (voteContent.getUid().toString().equals(localUserSession.getVoteContentId().toString())) { logger.debug("showUserEntriesByUserId is true"); if (userSessionId.equals(currentSessionId))