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.21 -r1.22 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteUsrAttemptDAO.java 1 Jul 2006 14:30:42 -0000 1.21 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteUsrAttemptDAO.java 1 Jul 2006 16:40:57 -0000 1.22 @@ -98,7 +98,7 @@ public void removeVoteUsrAttempt(VoteUsrAttempt voteUsrAttempt); - public Set getAttemptsForUserAndSession(final Long queUsrId, final Long voteSessionId) + public Set getAttemptsForUserAndSession(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.27 -r1.28 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java 1 Jul 2006 14:30:42 -0000 1.27 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java 1 Jul 2006 16:40:57 -0000 1.28 @@ -486,24 +486,35 @@ public Set getAttemptsForUserAndSession(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); 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())) { - userEntries.add(attempt.getVoteQueContent().getQuestion()); + if (!attempt.getVoteQueContentId().toString().equals("1")) + { + logger.debug("adding attempt question : " + attempt.getVoteQueContent().getQuestion()); + userEntries.add(attempt.getVoteQueContent().getQuestion()); + } } } } + logger.debug("returning userEntries: " + userEntries); return userEntries; } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/LearningUtil.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/Attic/LearningUtil.java,v diff -u -r1.17 -r1.18 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/LearningUtil.java 13 Jun 2006 05:50:20 -0000 1.17 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/LearningUtil.java 1 Jul 2006 16:40:57 -0000 1.18 @@ -144,7 +144,8 @@ * @param singleUserEntry * @param voteSession */ - public static void createAttempt(HttpServletRequest request, VoteQueUsr voteQueUsr, Map mapGeneralCheckedOptionsContent, String userEntry, boolean singleUserEntry, VoteSession voteSession) + public static void createAttempt(HttpServletRequest request, VoteQueUsr voteQueUsr, Map mapGeneralCheckedOptionsContent, String userEntry, + boolean singleUserEntry, VoteSession voteSession) { logger.debug("doing voteSession: " + voteSession); logger.debug("doing createAttempt: " + mapGeneralCheckedOptionsContent); @@ -158,39 +159,56 @@ Long toolContentUID= (Long) request.getSession().getAttribute(TOOL_CONTENT_UID); logger.debug("toolContentUID: " + toolContentUID); - - if (toolContentUID != null) + + + if ((mapGeneralCheckedOptionsContent.size() == 0)) { - Iterator itCheckedMap = mapGeneralCheckedOptionsContent.entrySet().iterator(); - while (itCheckedMap.hasNext()) - { - Map.Entry checkedPairs = (Map.Entry)itCheckedMap.next(); - Long questionDisplayOrder=new Long(checkedPairs.getKey().toString()); - - logger.debug("questionDisplayOrder: " + questionDisplayOrder); - - VoteQueContent voteQueContent=voteService.getQuestionContentByDisplayOrder(questionDisplayOrder, toolContentUID); - logger.debug("voteQueContent: " + voteQueContent); - if (voteQueContent != null) - { - createIndividualOptions(request, voteQueContent, voteQueUsr, attempTime, timeZone, userEntry, false, voteSession); - } - else if ((voteQueContent == null) && (questionDisplayOrder.toString().equals("101"))) - { - logger.debug("creating user entry record, 101"); - VoteQueContent localVoteQueContent=voteService.getToolDefaultQuestionContent(1); - logger.debug("localVoteQueContent: " + localVoteQueContent); - createIndividualOptions(request, localVoteQueContent, voteQueUsr, attempTime, timeZone, userEntry, true, voteSession); - } - else if ((voteQueContent == null) && (questionDisplayOrder.toString().equals("102"))) - { - logger.debug("creating user entry record, 102"); - VoteQueContent localVoteQueContent=voteService.getToolDefaultQuestionContent(1); - logger.debug("localVoteQueContent: " + localVoteQueContent); - createIndividualOptions(request, localVoteQueContent, voteQueUsr, attempTime, timeZone, userEntry, false, voteSession); - } - } + logger.debug("mapGeneralCheckedOptionsContent is empty"); + VoteQueContent localVoteQueContent=voteService.getToolDefaultQuestionContent(1); + logger.debug("localVoteQueContent: " + localVoteQueContent); + createIndividualOptions(request, localVoteQueContent, voteQueUsr, attempTime, timeZone, userEntry, singleUserEntry, voteSession); + } + else + { + logger.debug("mapGeneralCheckedOptionsContent is not empty"); + if (toolContentUID != null) + { + Iterator itCheckedMap = mapGeneralCheckedOptionsContent.entrySet().iterator(); + logger.debug("iterating mapGeneralCheckedOptionsContent"); + while (itCheckedMap.hasNext()) + { + Map.Entry checkedPairs = (Map.Entry)itCheckedMap.next(); + Long questionDisplayOrder=new Long(checkedPairs.getKey().toString()); + + logger.debug("questionDisplayOrder: " + questionDisplayOrder); + + VoteQueContent voteQueContent=voteService.getQuestionContentByDisplayOrder(questionDisplayOrder, toolContentUID); + logger.debug("voteQueContent: " + voteQueContent); + if (voteQueContent != null) + { + createIndividualOptions(request, voteQueContent, voteQueUsr, attempTime, timeZone, userEntry, false, voteSession); + } + /* + else if ((voteQueContent == null) && (questionDisplayOrder.toString().equals("101"))) + { + logger.debug("creating user entry record, 101"); + VoteQueContent localVoteQueContent=voteService.getToolDefaultQuestionContent(1); + logger.debug("localVoteQueContent: " + localVoteQueContent); + createIndividualOptions(request, localVoteQueContent, voteQueUsr, attempTime, timeZone, userEntry, true, voteSession); + } + else if ((voteQueContent == null) && (questionDisplayOrder.toString().equals("102"))) + { + logger.debug("creating user entry record, 102"); + VoteQueContent localVoteQueContent=voteService.getToolDefaultQuestionContent(1); + logger.debug("localVoteQueContent: " + localVoteQueContent); + createIndividualOptions(request, localVoteQueContent, voteQueUsr, attempTime, timeZone, userEntry, false, voteSession); + } + */ + } + } + } + } 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.28 -r1.29 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java 1 Jul 2006 14:30:42 -0000 1.28 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java 1 Jul 2006 16:40:57 -0000 1.29 @@ -26,6 +26,7 @@ import java.util.Collection; import java.util.Iterator; import java.util.List; +import java.util.Set; import java.util.Map; import java.util.TreeMap; @@ -151,7 +152,7 @@ logger.debug("existingVoteQueUsr: " + existingVoteQueUsr); - List userAttempts=voteService.getAttemptsForUserAndSession(existingVoteQueUsr.getUid(), toolSessionUid); + Set userAttempts=voteService.getAttemptsForUserAndSession(existingVoteQueUsr.getUid(), toolSessionUid); logger.debug("userAttempts: "+ userAttempts); request.setAttribute(LIST_GENERAL_CHECKED_OPTIONS_CONTENT, userAttempts); @@ -415,15 +416,15 @@ if (mapGeneralCheckedOptionsContent.size() > 0) { - LearningUtil.createAttempt(request, voteQueUsr, mapGeneralCheckedOptionsContent, userEntry, false, voteSession); + LearningUtil.createAttempt(request, voteQueUsr, mapGeneralCheckedOptionsContent, userEntry, false, voteSession); } if ((mapGeneralCheckedOptionsContent.size() == 0 && (userEntryAvailable == true))) { logger.debug("mapGeneralCheckedOptionsContent size is 0"); Map mapLeanerCheckedOptionsContent= new TreeMap(new VoteComparator()); - mapLeanerCheckedOptionsContent.put("101", userEntry); + //mapLeanerCheckedOptionsContent.put("101", userEntry); logger.debug("after mapsize check mapLeanerCheckedOptionsContent " + mapLeanerCheckedOptionsContent); if (userEntry.length() > 0) @@ -432,11 +433,12 @@ LearningUtil.createAttempt(request, voteQueUsr, mapLeanerCheckedOptionsContent, userEntry, true, voteSession); } } + if ((mapGeneralCheckedOptionsContent.size() > 0) && (userEntryAvailable == true)) { logger.debug("mapGeneralCheckedOptionsContent size is > 0" + userEntry); Map mapLeanerCheckedOptionsContent= new TreeMap(new VoteComparator()); - mapLeanerCheckedOptionsContent.put("102", userEntry); + //mapLeanerCheckedOptionsContent.put("102", userEntry); logger.debug("after mapsize check mapLeanerCheckedOptionsContent " + mapLeanerCheckedOptionsContent); if (userEntry.length() > 0)