Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java,v
diff -u -r1.20 -r1.21
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java	13 Jun 2006 17:59:45 -0000	1.20
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java	25 Jun 2006 15:14:30 -0000	1.21
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java,v
diff -u -r1.31 -r1.32
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java	13 Jun 2006 17:59:45 -0000	1.31
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java	25 Jun 2006 15:14:30 -0000	1.32
@@ -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))