Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java,v diff -u -r1.32 -r1.33 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java 11 Aug 2006 12:34:07 -0000 1.32 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java 12 Aug 2006 17:50:36 -0000 1.33 @@ -66,6 +66,8 @@ public static final String ALLOW_TEXT_ENTRY ="allowTextEntry"; public static final String VOTE_CHANGABLE ="voteChangable"; public static final String LOCK_ON_FINISH ="lockOnFinish"; + public static final String REPORT_VIEW_ONLY ="reportViewOnly"; + public static final String USER_ENTRY ="userEntry"; public static final String AUTHORING ="authoring"; public static final String SOURCE_VOTE_STARTER ="sourceVoteStarter"; Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteGeneralLearnerFlowDTO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/Attic/VoteGeneralLearnerFlowDTO.java,v diff -u -r1.1 -r1.2 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteGeneralLearnerFlowDTO.java 11 Aug 2006 12:34:07 -0000 1.1 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteGeneralLearnerFlowDTO.java 12 Aug 2006 17:50:36 -0000 1.2 @@ -71,6 +71,8 @@ protected String previewOnly; + protected String reportViewOnly; + protected String requestLearningReport; protected String requestLearningReportProgress; @@ -356,12 +358,25 @@ .append("mapStandardQuestionUid: ", mapStandardQuestionUid) .append("mapStandardToolSessionUid: ", mapStandardToolSessionUid) .append("listMonitoredAnswersContainerDto: ", listMonitoredAnswersContainerDto) - .append("listUserEntries: ", listUserEntries) + .append("listUserEntries: ", listUserEntries) + .append("reportViewOnly: ", reportViewOnly) .toString(); } /** + * @return Returns the reportViewOnly. + */ + public String getReportViewOnly() { + return reportViewOnly; + } + /** + * @param reportViewOnly The reportViewOnly to set. + */ + public void setReportViewOnly(String reportViewOnly) { + this.reportViewOnly = reportViewOnly; + } + /** * @return Returns the nominationsSubmited. */ public String getNominationsSubmited() { Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteUsrAttemptDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteUsrAttemptDAO.java,v diff -u -r1.22 -r1.23 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteUsrAttemptDAO.java 1 Jul 2006 16:40:57 -0000 1.22 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteUsrAttemptDAO.java 12 Aug 2006 17:50:36 -0000 1.23 @@ -99,6 +99,8 @@ public void removeVoteUsrAttempt(VoteUsrAttempt voteUsrAttempt); public Set getAttemptsForUserAndSession(final Long queUsrId, final Long voteSessionId); + + public Set getAttemptsForUserAndSessionUseOpenAnswer(final Long queUsrId, final Long voteSessionId); } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java,v diff -u -r1.28 -r1.29 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java 1 Jul 2006 16:40:57 -0000 1.28 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java 12 Aug 2006 17:50:36 -0000 1.29 @@ -518,9 +518,59 @@ return userEntries; } + + public Set getAttemptsForUserAndSessionUseOpenAnswer(final Long queUsrId, final Long voteSessionId) + { + logger.debug("starting getAttemptsForUserAndSession"); + logger.debug("queUsrId: " + queUsrId); + logger.debug("voteSessionId: " + voteSessionId); + + HibernateTemplate templ = this.getHibernateTemplate(); + List list = getSession().createQuery(LOAD_ATTEMPT_FOR_USER_AND_SESSION) + .setLong("queUsrId", queUsrId.longValue()) + .list(); + logger.debug("list: " + list); + + String openAnswer=""; + Set userEntries= new HashSet(); + if(list != null && list.size() > 0){ + Iterator listIterator=list.iterator(); + while (listIterator.hasNext()) + { + VoteUsrAttempt attempt=(VoteUsrAttempt)listIterator.next(); + logger.debug("attempt: " + attempt); + + if (attempt.getVoteQueUsr().getVoteSession().getUid().toString().equals(voteSessionId.toString())) + { + if (!attempt.getVoteQueContentId().toString().equals("1")) + { + logger.debug("adding attempt question : " + attempt.getVoteQueContent().getQuestion()); + userEntries.add(attempt.getVoteQueContent().getQuestion()); + } + else + { + logger.debug("this is a user entered vote: " + attempt.getUserEntry()); + if (attempt.getUserEntry().length() > 0) + { + openAnswer=attempt.getUserEntry(); + logger.debug("adding openAnswer to userEntries: "); + userEntries.add(openAnswer); + } + + } + + } + } + } + + logger.debug("final userEntries : " + userEntries); + return userEntries; + } + + public List getAttemptsListForUserAndQuestionContent(final Long queUsrId, final Long voteQueContentId) { HibernateTemplate templ = this.getHibernateTemplate(); 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.30 -r1.31 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java 1 Jul 2006 14:30:41 -0000 1.30 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java 12 Aug 2006 17:50:36 -0000 1.31 @@ -81,6 +81,8 @@ public List getAttemptsListForUserAndQuestionContent(final Long queUsrId, final Long voteQueContentId) throws VoteApplicationException; + public Set getAttemptsForUserAndSessionUseOpenAnswer(final Long queUsrId, final Long voteSessionId); + public int getLastNominationCount(Long userId) throws VoteApplicationException; public Set getSessionUserEntriesSet(final Long voteSessionUid) 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.41 -r1.42 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java 11 Aug 2006 12:34:07 -0000 1.41 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java 12 Aug 2006 17:50:35 -0000 1.42 @@ -285,6 +285,22 @@ e); } } + + + public Set getAttemptsForUserAndSessionUseOpenAnswer(final Long queUsrId, final Long voteSessionId) + { + try + { + return voteUsrAttemptDAO.getAttemptsForUserAndSessionUseOpenAnswer(queUsrId, voteSessionId); + } + catch (DataAccessException e) + { + throw new VoteApplicationException("Exception occured when lams is getting all user entries, standard plus open text" + + e.getMessage(), + e); + } + + } public int getCompletedSessionEntriesCount(final Long voteSessionUid) throws VoteApplicationException 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.31 -r1.32 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java 11 Aug 2006 12:34:07 -0000 1.31 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java 12 Aug 2006 17:50:35 -0000 1.32 @@ -191,6 +191,8 @@ { VoteLearningForm voteLearningForm = (VoteLearningForm) form; voteLearningForm.setNominationsSubmited(new Boolean(false).toString()); + + repopulateRequestParameters(request,voteLearningForm); VoteUtils.cleanUpUserExceptions(request); voteLearningForm.setMaxNominationCountReached(new Boolean(false).toString()); @@ -219,39 +221,16 @@ IVoteService voteService = VoteServiceProxy.getVoteService(getServlet().getServletContext()); logger.debug("retrieving voteService from session: " + voteService); - String toolSessionID=request.getParameter(TOOL_SESSION_ID); - logger.debug("toolSessionID: " + toolSessionID); - voteLearningForm.setToolSessionID(toolSessionID); - + repopulateRequestParameters(request,voteLearningForm); + + String toolSessionID=request.getParameter(TOOL_SESSION_ID); + logger.debug("toolSessionID: " + toolSessionID); + voteLearningForm.setToolSessionID(toolSessionID); + String userID=request.getParameter(USER_ID); logger.debug("userID: " + userID); voteLearningForm.setUserID(userID); - - String revisitingUser=request.getParameter(REVISITING_USER); - logger.debug("revisitingUser: " + revisitingUser); - voteLearningForm.setRevisitingUser(revisitingUser); - - String previewOnly=request.getParameter(PREVIEW_ONLY); - logger.debug("previewOnly: " + previewOnly); - voteLearningForm.setPreviewOnly(previewOnly); - - String maxNominationCount=request.getParameter(MAX_NOMINATION_COUNT); - logger.debug("maxNominationCount: " + maxNominationCount); - voteLearningForm.setMaxNominationCount(maxNominationCount); - - String allowTextEntry=request.getParameter(ALLOW_TEXT_ENTRY); - logger.debug("allowTextEntry: " + allowTextEntry); - voteLearningForm.setAllowTextEntry(allowTextEntry); - String voteChangable=request.getParameter(VOTE_CHANGABLE); - logger.debug("voteChangable: " + voteChangable); - voteLearningForm.setVoteChangable(voteChangable); - - String lockOnFinish=request.getParameter(LOCK_ON_FINISH); - logger.debug("lockOnFinish: " + lockOnFinish); - voteLearningForm.setLockOnFinish(lockOnFinish); - - VoteSession voteSession=voteService.retrieveVoteSession(new Long(toolSessionID)); logger.debug("retrieving voteSession: " + voteSession); @@ -317,39 +296,20 @@ IVoteService voteService = VoteServiceProxy.getVoteService(getServlet().getServletContext()); logger.debug("retrieving voteService from session: " + voteService); - String toolSessionID=request.getParameter(TOOL_SESSION_ID); - logger.debug("toolSessionID: " + toolSessionID); - voteLearningForm.setToolSessionID(toolSessionID); + repopulateRequestParameters(request,voteLearningForm); + String toolSessionID=request.getParameter(TOOL_SESSION_ID); + logger.debug("toolSessionID: " + toolSessionID); + voteLearningForm.setToolSessionID(toolSessionID); + String userID=request.getParameter(USER_ID); logger.debug("userID: " + userID); voteLearningForm.setUserID(userID); String revisitingUser=request.getParameter(REVISITING_USER); logger.debug("revisitingUser: " + revisitingUser); voteLearningForm.setRevisitingUser(revisitingUser); - - String previewOnly=request.getParameter(PREVIEW_ONLY); - logger.debug("previewOnly: " + previewOnly); - voteLearningForm.setPreviewOnly(previewOnly); - String maxNominationCount=request.getParameter(MAX_NOMINATION_COUNT); - logger.debug("maxNominationCount: " + maxNominationCount); - voteLearningForm.setMaxNominationCount(maxNominationCount); - - String allowTextEntry=request.getParameter(ALLOW_TEXT_ENTRY); - logger.debug("allowTextEntry: " + allowTextEntry); - voteLearningForm.setAllowTextEntry(allowTextEntry); - - String voteChangable=request.getParameter(VOTE_CHANGABLE); - logger.debug("voteChangable: " + voteChangable); - voteLearningForm.setVoteChangable(voteChangable); - - String lockOnFinish=request.getParameter(LOCK_ON_FINISH); - logger.debug("lockOnFinish: " + lockOnFinish); - voteLearningForm.setLockOnFinish(lockOnFinish); - - VoteSession voteSession=voteService.retrieveVoteSession(new Long(toolSessionID)); logger.debug("retrieving voteSession: " + voteSession); @@ -423,41 +383,21 @@ VoteLearningForm voteLearningForm = (VoteLearningForm) form; VoteGeneralLearnerFlowDTO voteGeneralLearnerFlowDTO= new VoteGeneralLearnerFlowDTO(); - String toolSessionID=request.getParameter(TOOL_SESSION_ID); - logger.debug("toolSessionID: " + toolSessionID); - voteLearningForm.setToolSessionID(toolSessionID); - - String userID=request.getParameter(USER_ID); + repopulateRequestParameters(request,voteLearningForm); + + String toolSessionID=request.getParameter(TOOL_SESSION_ID); + logger.debug("toolSessionID: " + toolSessionID); + voteLearningForm.setToolSessionID(toolSessionID); + + String userID=request.getParameter(USER_ID); logger.debug("userID: " + userID); voteLearningForm.setUserID(userID); String revisitingUser=request.getParameter(REVISITING_USER); logger.debug("revisitingUser: " + revisitingUser); voteLearningForm.setRevisitingUser(revisitingUser); - - String previewOnly=request.getParameter(PREVIEW_ONLY); - logger.debug("previewOnly: " + previewOnly); - voteLearningForm.setPreviewOnly(previewOnly); - String maxNominationCount=request.getParameter(MAX_NOMINATION_COUNT); - logger.debug("maxNominationCount: " + maxNominationCount); - voteLearningForm.setMaxNominationCount(maxNominationCount); - - String allowTextEntry=request.getParameter(ALLOW_TEXT_ENTRY); - logger.debug("allowTextEntry: " + allowTextEntry); - voteLearningForm.setAllowTextEntry(allowTextEntry); - - - String voteChangable=request.getParameter(VOTE_CHANGABLE); - logger.debug("voteChangable: " + voteChangable); - voteLearningForm.setVoteChangable(voteChangable); - - String lockOnFinish=request.getParameter(LOCK_ON_FINISH); - logger.debug("lockOnFinish: " + lockOnFinish); - voteLearningForm.setLockOnFinish(lockOnFinish); - - - + voteLearningForm.setNominationsSubmited(new Boolean(false).toString()); voteLearningForm.setMaxNominationCountReached(new Boolean(false).toString()); @@ -510,39 +450,20 @@ logger.debug("retrieving voteService from session: " + voteService); - String toolSessionID=request.getParameter(TOOL_SESSION_ID); - logger.debug("toolSessionID: " + toolSessionID); - voteLearningForm.setToolSessionID(toolSessionID); + repopulateRequestParameters(request,voteLearningForm); - String userID=request.getParameter(USER_ID); + String toolSessionID=request.getParameter(TOOL_SESSION_ID); + logger.debug("toolSessionID: " + toolSessionID); + voteLearningForm.setToolSessionID(toolSessionID); + + String userID=request.getParameter(USER_ID); logger.debug("userID: " + userID); voteLearningForm.setUserID(userID); String revisitingUser=request.getParameter(REVISITING_USER); logger.debug("revisitingUser: " + revisitingUser); voteLearningForm.setRevisitingUser(revisitingUser); - String previewOnly=request.getParameter(PREVIEW_ONLY); - logger.debug("previewOnly: " + previewOnly); - voteLearningForm.setPreviewOnly(previewOnly); - - String maxNominationCount=request.getParameter(MAX_NOMINATION_COUNT); - logger.debug("maxNominationCount: " + maxNominationCount); - voteLearningForm.setMaxNominationCount(maxNominationCount); - - - String allowTextEntry=request.getParameter(ALLOW_TEXT_ENTRY); - logger.debug("allowTextEntry: " + allowTextEntry); - voteLearningForm.setAllowTextEntry(allowTextEntry); - - String voteChangable=request.getParameter(VOTE_CHANGABLE); - logger.debug("voteChangable: " + voteChangable); - voteLearningForm.setVoteChangable(voteChangable); - - String lockOnFinish=request.getParameter(LOCK_ON_FINISH); - logger.debug("lockOnFinish: " + lockOnFinish); - voteLearningForm.setLockOnFinish(lockOnFinish); - VoteSession voteSession=voteService.retrieveVoteSession(new Long(toolSessionID)); logger.debug("retrieving voteSession: " + voteSession); @@ -614,41 +535,25 @@ IVoteService voteService = VoteServiceProxy.getVoteService(getServlet().getServletContext()); logger.debug("retrieving voteService from session: " + voteService); - String toolSessionID=request.getParameter(TOOL_SESSION_ID); - logger.debug("toolSessionID: " + toolSessionID); - voteLearningForm.setToolSessionID(toolSessionID); + repopulateRequestParameters(request,voteLearningForm); + String toolSessionID=request.getParameter(TOOL_SESSION_ID); + logger.debug("toolSessionID: " + toolSessionID); + voteLearningForm.setToolSessionID(toolSessionID); + String userID=request.getParameter(USER_ID); logger.debug("userID: " + userID); voteLearningForm.setUserID(userID); - String revisitingUser=request.getParameter(REVISITING_USER); - logger.debug("revisitingUser: " + revisitingUser); - voteLearningForm.setRevisitingUser(revisitingUser); - - - String previewOnly=request.getParameter(PREVIEW_ONLY); - logger.debug("previewOnly: " + previewOnly); - voteLearningForm.setPreviewOnly(previewOnly); - - String maxNominationCount=request.getParameter(MAX_NOMINATION_COUNT); logger.debug("maxNominationCount: " + maxNominationCount); voteLearningForm.setMaxNominationCount(maxNominationCount); + + String userEntry=request.getParameter(USER_ENTRY); + logger.debug("userEntry: " + userEntry); + voteLearningForm.setUserEntry(userEntry); - String allowTextEntry=request.getParameter(ALLOW_TEXT_ENTRY); - logger.debug("allowTextEntry: " + allowTextEntry); - voteLearningForm.setAllowTextEntry(allowTextEntry); - String voteChangable=request.getParameter(VOTE_CHANGABLE); - logger.debug("voteChangable: " + voteChangable); - voteLearningForm.setVoteChangable(voteChangable); - - String lockOnFinish=request.getParameter(LOCK_ON_FINISH); - logger.debug("lockOnFinish: " + lockOnFinish); - voteLearningForm.setLockOnFinish(lockOnFinish); - - VoteSession voteSession=voteService.retrieveVoteSession(new Long(toolSessionID)); logger.debug("retrieving voteSession: " + voteSession); @@ -664,7 +569,7 @@ // check number of votes int castVoteCount= voteDisplayOrderIds!=null ? voteDisplayOrderIds.size() : 0; - String userEntry=voteLearningForm.getUserEntry(); + //String userEntry=voteLearningForm.getUserEntry(); logger.debug("userEntry: " + userEntry); if ((userEntry != null) && (userEntry.length() > 0)) @@ -831,41 +736,21 @@ IVoteService voteService = VoteServiceProxy.getVoteService(getServlet().getServletContext()); logger.debug("retrieving voteService from session: " + voteService); - String toolSessionID=request.getParameter(TOOL_SESSION_ID); - logger.debug("toolSessionID: " + toolSessionID); - voteLearningForm.setToolSessionID(toolSessionID); + repopulateRequestParameters(request,voteLearningForm); - String userID=request.getParameter(USER_ID); + String toolSessionID=request.getParameter(TOOL_SESSION_ID); + logger.debug("toolSessionID: " + toolSessionID); + voteLearningForm.setToolSessionID(toolSessionID); + + String userID=request.getParameter(USER_ID); logger.debug("userID: " + userID); voteLearningForm.setUserID(userID); String revisitingUser=request.getParameter(REVISITING_USER); logger.debug("revisitingUser: " + revisitingUser); voteLearningForm.setRevisitingUser(revisitingUser); - - String previewOnly=request.getParameter(PREVIEW_ONLY); - logger.debug("previewOnly: " + previewOnly); - voteLearningForm.setPreviewOnly(previewOnly); - - String maxNominationCount=request.getParameter(MAX_NOMINATION_COUNT); - logger.debug("maxNominationCount: " + maxNominationCount); - voteLearningForm.setMaxNominationCount(maxNominationCount); - - - String allowTextEntry=request.getParameter(ALLOW_TEXT_ENTRY); - logger.debug("allowTextEntry: " + allowTextEntry); - voteLearningForm.setAllowTextEntry(allowTextEntry); - - String voteChangable=request.getParameter(VOTE_CHANGABLE); - logger.debug("voteChangable: " + voteChangable); - voteLearningForm.setVoteChangable(voteChangable); - - String lockOnFinish=request.getParameter(LOCK_ON_FINISH); - logger.debug("lockOnFinish: " + lockOnFinish); - voteLearningForm.setLockOnFinish(lockOnFinish); - VoteSession voteSession=voteService.retrieveVoteSession(new Long(toolSessionID)); logger.debug("retrieving voteSession: " + voteSession); @@ -897,7 +782,6 @@ voteLearningForm.setUserEntry(""); - logger.debug("previewOnly : " + previewOnly); logger.debug("fwd'ing to LOAD_LEARNER : " + LOAD_LEARNER); voteLearningForm.resetCommands(); @@ -935,5 +819,52 @@ saveErrors(request,errors); } + + protected void repopulateRequestParameters(HttpServletRequest request, VoteLearningForm voteLearningForm) + { + logger.debug("starting repopulateRequestParameters"); + + String toolSessionID=request.getParameter(TOOL_SESSION_ID); + logger.debug("toolSessionID: " + toolSessionID); + voteLearningForm.setToolSessionID(toolSessionID); + + String userID=request.getParameter(USER_ID); + logger.debug("userID: " + userID); + voteLearningForm.setUserID(userID); + + String revisitingUser=request.getParameter(REVISITING_USER); + logger.debug("revisitingUser: " + revisitingUser); + voteLearningForm.setRevisitingUser(revisitingUser); + + String previewOnly=request.getParameter(PREVIEW_ONLY); + logger.debug("previewOnly: " + previewOnly); + voteLearningForm.setPreviewOnly(previewOnly); + + String maxNominationCount=request.getParameter(MAX_NOMINATION_COUNT); + logger.debug("maxNominationCount: " + maxNominationCount); + voteLearningForm.setMaxNominationCount(maxNominationCount); + + String allowTextEntry=request.getParameter(ALLOW_TEXT_ENTRY); + logger.debug("allowTextEntry: " + allowTextEntry); + voteLearningForm.setAllowTextEntry(allowTextEntry); + + String voteChangable=request.getParameter(VOTE_CHANGABLE); + logger.debug("voteChangable: " + voteChangable); + voteLearningForm.setVoteChangable(voteChangable); + + String lockOnFinish=request.getParameter(LOCK_ON_FINISH); + logger.debug("lockOnFinish: " + lockOnFinish); + voteLearningForm.setLockOnFinish(lockOnFinish); + + String reportViewOnly=request.getParameter(REPORT_VIEW_ONLY); + logger.debug("reportViewOnly: " + reportViewOnly); + voteLearningForm.setReportViewOnly(reportViewOnly); + + String userEntry=request.getParameter(USER_ENTRY); + logger.debug("userEntry: " + userEntry); + voteLearningForm.setUserEntry(userEntry); + + } } - \ No newline at end of file + + Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningForm.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/Attic/VoteLearningForm.java,v diff -u -r1.17 -r1.18 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningForm.java 11 Aug 2006 12:34:07 -0000 1.17 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningForm.java 12 Aug 2006 17:50:35 -0000 1.18 @@ -87,13 +87,14 @@ protected String maxNominationCountReached; protected int castVoteCount; - protected Map mapGeneralCheckedOptionsContent; + protected Map mapGeneralCheckedOptionsContent; - protected String userID; - protected String toolSessionID; + protected String userID; + protected String toolSessionID; protected String learningMode; protected String toolContentUID; protected String previewOnly; + protected String reportViewOnly; /** @@ -706,11 +707,25 @@ .append("nominationsSubmited: ", nominationsSubmited) .append("toolContentUID: ", toolContentUID) .append("previewOnly: ", previewOnly) + .append("reportViewOnly: ", reportViewOnly) .append("mapGeneralCheckedOptionsContent: ", mapGeneralCheckedOptionsContent) .toString(); } + + /** + * @return Returns the reportViewOnly. + */ + public String getReportViewOnly() { + return reportViewOnly; + } /** + * @param reportViewOnly The reportViewOnly to set. + */ + public void setReportViewOnly(String reportViewOnly) { + this.reportViewOnly = reportViewOnly; + } +/** * @return Returns the toolSessionID. */ public String getToolSessionID() { 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.27 -r1.28 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java 11 Aug 2006 12:34:07 -0000 1.27 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java 12 Aug 2006 17:50:35 -0000 1.28 @@ -150,6 +150,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.TreeMap; import javax.servlet.ServletException; @@ -337,6 +338,7 @@ voteGeneralLearnerFlowDTO.setRequestLearningReport(new Boolean(true).toString()); voteGeneralLearnerFlowDTO.setRequestLearningReportProgress(new Boolean(true).toString()); + voteGeneralLearnerFlowDTO.setReportViewOnly(new Boolean(true).toString()); logger.debug("learner progress voteGeneralLearnerFlowDTO: " + voteGeneralLearnerFlowDTO); request.setAttribute(VOTE_GENERAL_LEARNER_FLOW_DTO,voteGeneralLearnerFlowDTO); @@ -470,6 +472,19 @@ boolean isSessionCompleted=isSessionCompleted(userSessionId, voteService); logger.debug("isSessionCompleted: " + isSessionCompleted); + if (isSessionCompleted) + { + logger.debug("since the sessio is completed. present a screen which can not be edited"); + voteLearningForm.setReportViewOnly(new Boolean(true).toString()); + voteGeneralLearnerFlowDTO.setReportViewOnly(new Boolean(true).toString()); + } + + logger.debug("geting user answers for user uid and sessionUid" + voteQueUsr.getUid() + " " + sessionUid); + Set userAttempts=voteService.getAttemptsForUserAndSessionUseOpenAnswer(voteQueUsr.getUid(), sessionUid); + logger.debug("userAttempts: "+ userAttempts); + request.setAttribute(LIST_GENERAL_CHECKED_OPTIONS_CONTENT, userAttempts); + + String isContentLockOnFinish=voteLearningForm.getLockOnFinish(); logger.debug("isContentLockOnFinish: " + isContentLockOnFinish); if ((isContentLockOnFinish.equals(new Boolean(true).toString()) && (isSessionCompleted == true))) @@ -479,14 +494,17 @@ return (mapping.findForward(EXIT_PAGE)); } - logger.debug("the user's session id AND user id exists in the tool tables go to redo questions. " + toolSessionID + " voteQueUsr: " + voteQueUsr + " user id: " + voteQueUsr.getQueUsrId()); voteLearningForm.setRevisitingUser(new Boolean(true).toString()); voteGeneralLearnerFlowDTO.setRevisitingUser(new Boolean(true).toString()); logger.debug("preparing chart data for readonly mode"); MonitoringUtil.prepareChartData(request, voteService, null, voteContent.getVoteContentId().toString(), toolSessionID, voteGeneralLearnerFlowDTO); + //voteLearningForm.setReportViewOnly(new Boolean(true).toString()); + //voteGeneralLearnerFlowDTO.setReportViewOnly(new Boolean(true).toString()); + + logger.debug("view-only voteGeneralLearnerFlowDTO: " + voteGeneralLearnerFlowDTO); request.setAttribute(VOTE_GENERAL_LEARNER_FLOW_DTO,voteGeneralLearnerFlowDTO); Index: lams_tool_vote/web/learning/AllNominations.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/AllNominations.jsp,v diff -u -r1.18 -r1.19 --- lams_tool_vote/web/learning/AllNominations.jsp 11 Aug 2006 12:34:07 -0000 1.18 +++ lams_tool_vote/web/learning/AllNominations.jsp 12 Aug 2006 17:50:33 -0000 1.19 @@ -66,6 +66,9 @@ + + + @@ -123,8 +126,6 @@ - -
@@ -135,7 +136,6 @@ - @@ -177,8 +177,6 @@
- -   @@ -206,6 +204,9 @@ + + + @@ -234,6 +235,7 @@ + Index: lams_tool_vote/web/learning/AnswersContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/AnswersContent.jsp,v diff -u -r1.19 -r1.20 --- lams_tool_vote/web/learning/AnswersContent.jsp 11 Aug 2006 12:34:07 -0000 1.19 +++ lams_tool_vote/web/learning/AnswersContent.jsp 12 Aug 2006 17:50:33 -0000 1.20 @@ -115,8 +115,8 @@ + -
Index: lams_tool_vote/web/learning/ExitLearning.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/ExitLearning.jsp,v diff -u -r1.8 -r1.9 --- lams_tool_vote/web/learning/ExitLearning.jsp 11 Aug 2006 12:34:07 -0000 1.8 +++ lams_tool_vote/web/learning/ExitLearning.jsp 12 Aug 2006 17:50:34 -0000 1.9 @@ -66,7 +66,9 @@ - + + + Index: lams_tool_vote/web/learning/IndividualLearnerResults.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/IndividualLearnerResults.jsp,v diff -u -r1.15 -r1.16 --- lams_tool_vote/web/learning/IndividualLearnerResults.jsp 11 Aug 2006 12:34:07 -0000 1.15 +++ lams_tool_vote/web/learning/IndividualLearnerResults.jsp 12 Aug 2006 17:50:34 -0000 1.16 @@ -67,7 +67,8 @@ - + +
@@ -82,7 +84,7 @@
- +