Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java,v diff -u -r1.27 -r1.28 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java 25 May 2006 00:40:34 -0000 1.27 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java 29 May 2006 14:15:37 -0000 1.28 @@ -93,6 +93,10 @@ public List getUserBySessionOnly(final VoteSession voteSession) throws VoteApplicationException; + public void hideOpenVote(VoteUsrAttempt voteUsrAttempt) throws VoteApplicationException; + + public void showOpenVote(VoteUsrAttempt voteUsrAttempt) throws VoteApplicationException; + public void updateVoteQueContent(VoteQueContent voteQueContent) throws VoteApplicationException; public int getAttemptsForQuestionContent(final Long voteQueContentId) throws VoteApplicationException; Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java,v diff -u -r1.32 -r1.33 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java 29 May 2006 07:21:08 -0000 1.32 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java 29 May 2006 14:15:37 -0000 1.33 @@ -463,9 +463,6 @@ { try { - auditService.logShowEntry(MY_SIGNATURE, voteQueUsr.getQueUsrId(), - voteQueUsr.getUsername(), voteQueUsr.toString()); - voteUserDAO.saveVoteUser(voteQueUsr); } catch (DataAccessException e) @@ -526,9 +523,6 @@ { try { - auditService.logShowEntry(MY_SIGNATURE, voteUsrAttempt.getQueUsrId(), - voteUsrAttempt.getVoteQueUsr().getUsername(), voteUsrAttempt.toString()); - voteUsrAttemptDAO.saveVoteUsrAttempt(voteUsrAttempt); } catch (DataAccessException e) @@ -737,9 +731,6 @@ { try { - auditService.logShowEntry(MY_SIGNATURE, voteUsrAttempt.getQueUsrId(), - voteUsrAttempt.getVoteQueUsr().getUsername(), voteUsrAttempt.toString()); - voteUsrAttemptDAO.updateVoteUsrAttempt(voteUsrAttempt); } catch (DataAccessException e) @@ -1138,9 +1129,6 @@ { try { - auditService.logShowEntry(MY_SIGNATURE, attempt.getQueUsrId(), - attempt.getVoteQueUsr().getUsername(), attempt.toString()); - voteUsrAttemptDAO.removeVoteUsrAttempt(attempt); } catch(DataAccessException e) @@ -1166,14 +1154,28 @@ } } + + public void hideOpenVote(VoteUsrAttempt voteUsrAttempt) throws VoteApplicationException + { + logger.debug("hiding user entry: " + voteUsrAttempt.getUserEntry()); + auditService.logHideEntry(MY_SIGNATURE, voteUsrAttempt.getQueUsrId(), + voteUsrAttempt.getVoteQueUsr().getUsername(), voteUsrAttempt.getUserEntry()); + } + + public void showOpenVote(VoteUsrAttempt voteUsrAttempt) throws VoteApplicationException + { + logger.debug("showing user entry: " + voteUsrAttempt.getUserEntry()); + auditService.logShowEntry(MY_SIGNATURE, voteUsrAttempt.getQueUsrId(), + voteUsrAttempt.getVoteQueUsr().getUsername(), voteUsrAttempt.getUserEntry()); + } public void deleteVoteQueUsr(VoteQueUsr voteQueUsr) throws VoteApplicationException { try { - auditService.logShowEntry(MY_SIGNATURE, voteQueUsr.getQueUsrId(), - voteQueUsr.getUsername(), voteQueUsr.toString()); + //auditService.logShowEntry(MY_SIGNATURE, voteQueUsr.getQueUsrId(), + // voteQueUsr.getUsername(), voteQueUsr.toString()); voteUserDAO.removeVoteUser(voteQueUsr); } @@ -1541,6 +1543,7 @@ } } + /** * Export the XML fragment for the tool's content, along with any files needed * for the content. 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.25 -r1.26 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java 27 May 2006 00:48:09 -0000 1.25 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java 29 May 2006 14:15:37 -0000 1.26 @@ -908,6 +908,8 @@ logger.debug("voteUsrAttempt: " + voteUsrAttempt); voteUsrAttempt.setVisible(false); voteService.updateVoteUsrAttempt(voteUsrAttempt); + logger.debug("hiding the user entry : " + voteUsrAttempt.getUserEntry()); + voteService.hideOpenVote(voteUsrAttempt); Long toolContentId =(Long) request.getSession().getAttribute(TOOL_CONTENT_ID); logger.debug("toolContentId: " + toolContentId); @@ -963,7 +965,8 @@ logger.debug("voteUsrAttempt: " + voteUsrAttempt); voteUsrAttempt.setVisible(true); voteService.updateVoteUsrAttempt(voteUsrAttempt); - + voteService.showOpenVote(voteUsrAttempt); + Long toolContentId =(Long) request.getSession().getAttribute(TOOL_CONTENT_ID); logger.debug("toolContentId: " + toolContentId);