Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java =================================================================== diff -u -rf4622422fe3e19c1205d05b4e7d90a5ab5f48cd0 -rf29e20502462a1c913b9fbb8da5ada07a729db04 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java (.../VoteUsrAttemptDAO.java) (revision f4622422fe3e19c1205d05b4e7d90a5ab5f48cd0) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java (.../VoteUsrAttemptDAO.java) (revision f29e20502462a1c913b9fbb8da5ada07a729db04) @@ -378,7 +378,7 @@ VoteUsrAttempt attempt=(VoteUsrAttempt)listIterator.next(); if (attempt.getVoteQueUsr().getVoteSession().getUid().toString().equals(voteSessionUid.toString())) { - userEntries.add(attempt.getVoteQueUsr().getFullname()); + userEntries.add(attempt); } } } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java =================================================================== diff -u -rf4622422fe3e19c1205d05b4e7d90a5ab5f48cd0 -rf29e20502462a1c913b9fbb8da5ada07a729db04 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java (.../MonitoringUtil.java) (revision f4622422fe3e19c1205d05b4e7d90a5ab5f48cd0) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java (.../MonitoringUtil.java) (revision f29e20502462a1c913b9fbb8da5ada07a729db04) @@ -278,7 +278,7 @@ VoteMonitoredUserDTO voteMonitoredUserDTO = new VoteMonitoredUserDTO(); voteMonitoredUserDTO.setAttemptTime(voteUsrResp.getAttemptTime().toString()); voteMonitoredUserDTO.setTimeZone(voteUsrResp.getTimeZone()); - voteMonitoredUserDTO.setUserName(voteQueUsr.getUsername()); + voteMonitoredUserDTO.setUserName(voteQueUsr.getFullname()); voteMonitoredUserDTO.setQueUsrId(voteQueUsr.getUid().toString()); voteMonitoredUserDTO.setSessionId(sessionId.toString()); voteMonitoredUserDTO.setUserEntry(voteUsrResp.getUserEntry()); @@ -355,7 +355,7 @@ voteMonitoredUserDTO.setAttemptTime(voteUsrResp.getAttemptTime().toString()); voteMonitoredUserDTO.setTimeZone(voteUsrResp.getTimeZone()); voteMonitoredUserDTO.setUid(voteUsrResp.getUid().toString()); - voteMonitoredUserDTO.setUserName(voteQueUsr.getUsername()); + voteMonitoredUserDTO.setUserName(voteQueUsr.getFullname()); voteMonitoredUserDTO.setQueUsrId(voteQueUsr.getUid().toString()); voteMonitoredUserDTO.setSessionId(sessionId.toString()); voteMonitoredUserDTO.setUserEntry(voteUsrResp.getUserEntry()); @@ -435,7 +435,7 @@ if (userID.equals(voteQueUsr.getQueUsrId().toString())) { logger.debug("this is current user, put his name normally."); - voteMonitoredUserDTO.setUserName(voteQueUsr.getUsername()); + voteMonitoredUserDTO.setUserName(voteQueUsr.getFullname()); } else { @@ -519,7 +519,7 @@ voteMonitoredUserDTO.setAttemptTime(voteUsrResp.getAttemptTime().toString()); voteMonitoredUserDTO.setTimeZone(voteUsrResp.getTimeZone()); voteMonitoredUserDTO.setUid(voteUsrResp.getUid().toString()); - voteMonitoredUserDTO.setUserName(voteQueUsr.getUsername()); + voteMonitoredUserDTO.setUserName(voteQueUsr.getFullname()); voteMonitoredUserDTO.setQueUsrId(voteQueUsr.getUid().toString()); voteMonitoredUserDTO.setSessionId(sessionId.toString()); voteMonitoredUserDTO.setUserEntry(voteUsrResp.getUserEntry()); @@ -761,11 +761,15 @@ mapStandardUserCount.put(mapIndex.toString(),new Integer(votesCount).toString()); totalStandardVotesCount=totalStandardVotesCount + votesCount; - double voteRate=0d; + double doubleVotesCount=votesCount * 1d; + logger.debug("doubleVotesCount: " + doubleVotesCount); + double doubleEntriesCount=entriesCount * 1d; + logger.debug("doubleEntriesCount: " + doubleEntriesCount); + if (entriesCount != 0) { - voteRate=((votesCount * 100)/ entriesCount); + voteRate=((doubleVotesCount * 100)/ doubleEntriesCount); } logger.debug("voteRate" + voteRate); @@ -799,15 +803,29 @@ logger.debug("totalStandardVotesCount: " + totalStandardVotesCount); int userEnteredVotesCount=entriesCount - totalStandardVotesCount; logger.debug("userEnteredVotesCount for this session: " + userEnteredVotesCount); - - if (userEnteredVotesCount == 0) - share=0; + + if (userEnteredVotesCount != 0) + { + share=((userEnteredVotesCount * 100)/ entriesCount); + logger.debug("calculated share normally, userEnteredVotesCount: " + userEnteredVotesCount); + logger.debug("calculated share normally, entriesCount: " + entriesCount); + } + else + { + share=0; + logger.debug("reset share"); + } + logger.debug("final share: " + share); mapStandardNominationsContent.put(mapIndex.toString(), "Open Vote"); mapStandardNominationsHTMLedContent.put(mapIndex.toString(), "Open Vote"); mapStandardRatesContent.put(mapIndex.toString(), new Double(share).toString()); mapStandardUserCount.put(mapIndex.toString(), new Integer(userEnteredVotesCount).toString()); + /**following are needed just for proper iteration in the summary jsp*/ + mapStandardQuestionUid.put(mapIndex.toString(),"1"); + mapStandardToolSessionUid.put(mapIndex.toString(),"1"); + logger.debug("processed for prepareChartDTO: mapStandardNominationsContent: " + mapStandardNominationsContent); logger.debug("processed for prepareChartDTO: mapStandardNominationsHTMLedContent: " + mapStandardNominationsHTMLedContent); logger.debug("processed for prepareChartDTO: mapStandardUserCount: " + mapStandardUserCount); @@ -954,9 +972,13 @@ } double voteRate=0d; + double doubleVotesCount=votesCount * 1d; + logger.debug("doubleVotesCount: " + doubleVotesCount); + double doubleEntriesCount=entriesCount * 1d; + logger.debug("doubleEntriesCount: " + doubleEntriesCount); if (entriesCount != 0) { - voteRate=((votesCount * 100)/ entriesCount); + voteRate=((doubleVotesCount * 100)/ doubleEntriesCount); } logger.debug("voteRate" + voteRate); @@ -992,13 +1014,28 @@ int userEnteredVotesCount=entriesCount - totalStandardVotesCount; logger.debug("userEnteredVotesCount for this session: " + userEnteredVotesCount); - if (userEnteredVotesCount == 0) - share=0; + if (userEnteredVotesCount != 0) + { + share=((userEnteredVotesCount * 100)/ entriesCount); + logger.debug("calculated share normally, userEnteredVotesCount: " + userEnteredVotesCount); + logger.debug("calculated share normally, entriesCount: " + entriesCount); + } + else + { + share=0; + logger.debug("reset share"); + } + logger.debug("final share: " + share); + mapStandardNominationsContent.put(mapIndex.toString(), "Open Vote"); mapStandardNominationsHTMLedContent.put(mapIndex.toString(), "Open Vote"); mapStandardRatesContent.put(mapIndex.toString(), new Double(share).toString()); mapStandardUserCount.put(mapIndex.toString(), new Integer(userEnteredVotesCount).toString()); + /**following are needed just for proper iteration in the summary jsp*/ + mapStandardQuestionUid.put(mapIndex.toString(),"1"); + mapStandardToolSessionUid.put(mapIndex.toString(),"1"); + request.getSession().setAttribute(MAP_STANDARD_NOMINATIONS_CONTENT, mapStandardNominationsContent); logger.debug("test2: MAP_STANDARD_NOMINATIONS_CONTENT: " + request.getSession().getAttribute(MAP_STANDARD_NOMINATIONS_CONTENT)); @@ -1121,9 +1158,13 @@ } double voteRate=0d; + double doubleVotesCount=votesCount * 1d; + logger.debug("doubleVotesCount: " + doubleVotesCount); + double doubleEntriesCount=entriesCount * 1d; + logger.debug("doubleEntriesCount: " + doubleEntriesCount); if (entriesCount != 0) { - voteRate=((votesCount * 100)/ entriesCount); + voteRate=((doubleVotesCount * 100)/ doubleEntriesCount); } logger.debug("voteRate" + voteRate); @@ -1160,8 +1201,18 @@ int userEnteredVotesCount=entriesCount - totalStandardVotesCount; logger.debug("userEnteredVotesCount for this session: " + userEnteredVotesCount); - if (userEnteredVotesCount == 0) - share=0; + if (userEnteredVotesCount != 0) + { + share=((userEnteredVotesCount * 100)/ entriesCount); + logger.debug("calculated share normally, userEnteredVotesCount: " + userEnteredVotesCount); + logger.debug("calculated share normally, entriesCount: " + entriesCount); + } + else + { + share=0; + logger.debug("reset share"); + } + logger.debug("final share: " + share); logger.debug("start processing userEntries: " + userEntries); @@ -1262,6 +1313,7 @@ logger.debug("entriesCount: " + entriesCount); Map mapStandardNominationsHTMLedContent= new TreeMap(new VoteComparator()); + while (queIterator.hasNext()) { VoteQueContent voteQueContent=(VoteQueContent) queIterator.next(); @@ -1281,9 +1333,13 @@ double voteRate=0d; + double doubleVotesCount=votesCount * 1d; + logger.debug("doubleVotesCount: " + doubleVotesCount); + double doubleEntriesCount=entriesCount * 1d; + logger.debug("doubleEntriesCount: " + doubleEntriesCount); if (entriesCount != 0) { - voteRate=((votesCount * 100)/ entriesCount); + voteRate=((doubleVotesCount * 100)/ doubleEntriesCount); } logger.debug("voteRate" + voteRate); @@ -1318,8 +1374,18 @@ int userEnteredVotesCount=entriesCount - totalStandardVotesCount; logger.debug("userEnteredVotesCount for this session: " + userEnteredVotesCount); - if (userEnteredVotesCount == 0) - share=0; + if (userEnteredVotesCount != 0) + { + share=((userEnteredVotesCount * 100)/ entriesCount); + logger.debug("calculated share normally, userEnteredVotesCount: " + userEnteredVotesCount); + logger.debug("calculated share normally, entriesCount: " + entriesCount); + } + else + { + share=0; + logger.debug("reset share"); + } + logger.debug("final share: " + share); mapStandardNominationsContent.put(mapIndex.toString(), "Open Vote"); Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java =================================================================== diff -u -r796f0357fbc2197eb4fda5397cc0c01c6de41d0d -rf29e20502462a1c913b9fbb8da5ada07a729db04 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java (.../VoteMonitoringAction.java) (revision 796f0357fbc2197eb4fda5397cc0c01c6de41d0d) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java (.../VoteMonitoringAction.java) (revision f29e20502462a1c913b9fbb8da5ada07a729db04) @@ -322,7 +322,7 @@ { voteMonitoredUserDTO.setAttemptTime(voteUsrAttempt.getAttemptTime().toString()); voteMonitoredUserDTO.setTimeZone(voteUsrAttempt.getTimeZone()); - voteMonitoredUserDTO.setUserName(voteUsrAttempt.getVoteQueUsr().getUsername()); + voteMonitoredUserDTO.setUserName(voteUsrAttempt.getVoteQueUsr().getFullname()); voteMonitoredUserDTO.setQueUsrId(voteUsrAttempt.getVoteQueUsr().getUid().toString()); voteMonitoredUserDTO.setUserEntry(voteUsrAttempt.getUserEntry()); voteMonitoredUserDTO.setUid(voteUsrAttempt.getUid().toString()); @@ -350,7 +350,7 @@ logger.debug("this is requested by user id: " + userId); voteMonitoredUserDTO.setAttemptTime(voteUsrAttempt.getAttemptTime().toString()); voteMonitoredUserDTO.setTimeZone(voteUsrAttempt.getTimeZone()); - voteMonitoredUserDTO.setUserName(voteUsrAttempt.getVoteQueUsr().getUsername()); + voteMonitoredUserDTO.setUserName(voteUsrAttempt.getVoteQueUsr().getFullname()); voteMonitoredUserDTO.setQueUsrId(voteUsrAttempt.getVoteQueUsr().getUid().toString()); voteMonitoredUserDTO.setUserEntry(voteUsrAttempt.getUserEntry()); listMonitoredUserContainerDTO.add(voteMonitoredUserDTO); @@ -381,7 +381,7 @@ logger.debug("this is requested by session id: " + currentSessionId); voteMonitoredUserDTO.setAttemptTime(voteUsrAttempt.getAttemptTime().toString()); voteMonitoredUserDTO.setTimeZone(voteUsrAttempt.getTimeZone()); - voteMonitoredUserDTO.setUserName(voteUsrAttempt.getVoteQueUsr().getUsername()); + voteMonitoredUserDTO.setUserName(voteUsrAttempt.getVoteQueUsr().getFullname()); voteMonitoredUserDTO.setQueUsrId(voteUsrAttempt.getVoteQueUsr().getUid().toString()); voteMonitoredUserDTO.setUserEntry(voteUsrAttempt.getUserEntry()); listMonitoredUserContainerDTO.add(voteMonitoredUserDTO); Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteNominationViewer.java =================================================================== diff -u -rf4622422fe3e19c1205d05b4e7d90a5ab5f48cd0 -rf29e20502462a1c913b9fbb8da5ada07a729db04 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteNominationViewer.java (.../VoteNominationViewer.java) (revision f4622422fe3e19c1205d05b4e7d90a5ab5f48cd0) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteNominationViewer.java (.../VoteNominationViewer.java) (revision f29e20502462a1c913b9fbb8da5ada07a729db04) @@ -34,6 +34,7 @@ import org.apache.log4j.Logger; import org.lamsfoundation.lams.tool.vote.VoteAppConstants; +import org.lamsfoundation.lams.tool.vote.pojos.VoteUsrAttempt; import org.lamsfoundation.lams.tool.vote.service.IVoteService; /** @@ -81,16 +82,25 @@ out.println(""); out.println(""); out.println(""); - out.println(""); - + out.println(""); + + out.println(""); + out.println(""); + out.println(""); + out.println(""); + Iterator userIterator=userNames.iterator(); while (userIterator.hasNext()) { - String userName=(String)userIterator.next(); + VoteUsrAttempt voteUsrAttempt=(VoteUsrAttempt)userIterator.next(); out.println(""); - out.println(""); + out.println(""); + + out.println(""); out.println(""); } out.println("
Students Voted
Students Voted
Student Name Attempt Time
"); - out.println(userName); - out.println(""); + out.println(voteUsrAttempt.getVoteQueUsr().getFullname()); + out.println(""); + out.println(voteUsrAttempt.getAttemptTime()); + out.println("
"); Index: lams_tool_vote/web/monitoring/AllSessionsSummary.jsp =================================================================== diff -u -rf4622422fe3e19c1205d05b4e7d90a5ab5f48cd0 -rf29e20502462a1c913b9fbb8da5ada07a729db04 --- lams_tool_vote/web/monitoring/AllSessionsSummary.jsp (.../AllSessionsSummary.jsp) (revision f4622422fe3e19c1205d05b4e7d90a5ab5f48cd0) +++ lams_tool_vote/web/monitoring/AllSessionsSummary.jsp (.../AllSessionsSummary.jsp) (revision f29e20502462a1c913b9fbb8da5ada07a729db04) @@ -153,15 +153,19 @@ - - - - - - - - - + + + + + + + + + + + + + Index: lams_tool_vote/web/monitoring/IndividualSessionSummary.jsp =================================================================== diff -u -rf4622422fe3e19c1205d05b4e7d90a5ab5f48cd0 -rf29e20502462a1c913b9fbb8da5ada07a729db04 --- lams_tool_vote/web/monitoring/IndividualSessionSummary.jsp (.../IndividualSessionSummary.jsp) (revision f4622422fe3e19c1205d05b4e7d90a5ab5f48cd0) +++ lams_tool_vote/web/monitoring/IndividualSessionSummary.jsp (.../IndividualSessionSummary.jsp) (revision f29e20502462a1c913b9fbb8da5ada07a729db04) @@ -146,23 +146,25 @@ - - - - - - - - - + + + + + + + + + + + + - - +