Index: lams_tool_vote/conf/language/ApplicationResources.properties =================================================================== diff -u -r4ca13e684e012f8917f07a4ea8121c5c35d0ac4e -r796f0357fbc2197eb4fda5397cc0c01c6de41d0d --- lams_tool_vote/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision 4ca13e684e012f8917f07a4ea8121c5c35d0ac4e) +++ lams_tool_vote/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision 796f0357fbc2197eb4fda5397cc0c01c6de41d0d) @@ -128,7 +128,8 @@ label.individual.learnerVotes =Individual Learner Votes label.all.learnerVotes =All Learner Votes label.warning =Warning -label.summary.sessionSeparator =------------------------------------------------------------------------------------ +label.summary.sessionSeparator =_________________________________________________ +label.groupName =Group Name: Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAllSessionsDTO.java =================================================================== diff -u -r168d3aadc7610e2b46667fe0c1200f164ee4cf4c -r796f0357fbc2197eb4fda5397cc0c01c6de41d0d --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAllSessionsDTO.java (.../VoteAllSessionsDTO.java) (revision 168d3aadc7610e2b46667fe0c1200f164ee4cf4c) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAllSessionsDTO.java (.../VoteAllSessionsDTO.java) (revision 796f0357fbc2197eb4fda5397cc0c01c6de41d0d) @@ -39,11 +39,13 @@ private String completedSessionUserCount; private String completedSessionUserPercent; private String sessionId; + private String sessionName; private Map mapStandardNominationsContent; private Map mapStandardNominationsHTMLedContent; private Map mapStandardUserCount; private Map mapStandardRatesContent; private List listUserEntries; + private String existsOpenVote; /** * @return Returns the listUserEntries. @@ -173,4 +175,28 @@ Map mapStandardNominationsHTMLedContent) { this.mapStandardNominationsHTMLedContent = mapStandardNominationsHTMLedContent; } + /** + * @return Returns the existsOpenVote. + */ + public String getExistsOpenVote() { + return existsOpenVote; + } + /** + * @param existsOpenVote The existsOpenVote to set. + */ + public void setExistsOpenVote(String existsOpenVote) { + this.existsOpenVote = existsOpenVote; + } + /** + * @return Returns the sessionName. + */ + public String getSessionName() { + return sessionName; + } + /** + * @param sessionName The sessionName to set. + */ + public void setSessionName(String sessionName) { + this.sessionName = sessionName; + } } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java =================================================================== diff -u -r168d3aadc7610e2b46667fe0c1200f164ee4cf4c -r796f0357fbc2197eb4fda5397cc0c01c6de41d0d --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java (.../VoteAppConstants.java) (revision 168d3aadc7610e2b46667fe0c1200f164ee4cf4c) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java (.../VoteAppConstants.java) (revision 796f0357fbc2197eb4fda5397cc0c01c6de41d0d) @@ -186,6 +186,7 @@ public static final String ACTIVITY_INSTRUCTIONS = "activityInstructions"; public static final String MONITORING ="monitoring"; public static final String REMOVABLE_QUESTION_INDEX ="removableQuestionIndex"; + public static final String EXISTS_OPEN_VOTES ="existsOpenVotes"; /* * user actions @@ -235,6 +236,7 @@ public static final String CURRENT_MONITORED_TOOL_SESSION ="currentMonitoredToolSession"; public static final String SELECTION_CASE ="selectionCase"; public static final String LIST_MONITORED_ANSWERS_CONTAINER_DTO ="listMonitoredAnswersContainerDto"; + public static final String GROUP_NAME ="groupName"; public static final String TIMEZONE ="timeZone"; public static final String PREVIEW_ONLY ="previewOnly"; Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java =================================================================== diff -u -r168d3aadc7610e2b46667fe0c1200f164ee4cf4c -r796f0357fbc2197eb4fda5397cc0c01c6de41d0d --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java (.../MonitoringUtil.java) (revision 168d3aadc7610e2b46667fe0c1200f164ee4cf4c) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java (.../MonitoringUtil.java) (revision 796f0357fbc2197eb4fda5397cc0c01c6de41d0d) @@ -695,6 +695,7 @@ VoteAllSessionsDTO voteAllSessionsDTO= new VoteAllSessionsDTO(); voteAllSessionsDTO.setSessionId(voteSession.getVoteSessionId().toString()); + voteAllSessionsDTO.setSessionName(voteSession.getSession_name()); int entriesCount=voteService.getSessionEntriesCount(voteSession.getUid()); logger.debug("entriesCount: " + entriesCount); @@ -811,7 +812,12 @@ List listUserEntries=voteMonitoringAction.processUserEnteredNominations(voteService, voteContent, voteSession.getVoteSessionId().toString(), true, null, false); logger.debug("listUserEntries: " + listUserEntries); voteAllSessionsDTO.setListUserEntries(listUserEntries); - + + if (listUserEntries.size() > 0) + voteAllSessionsDTO.setExistsOpenVote (new Boolean(true).toString()); + else + voteAllSessionsDTO.setExistsOpenVote (new Boolean(false).toString()); + listVoteAllSessionsDTO.add(voteAllSessionsDTO); } logger.debug("listVoteAllSessionsDTO: " + listVoteAllSessionsDTO); Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java =================================================================== diff -u -r5b769706d761b4bd00911b062a4b01061ef2c506 -r796f0357fbc2197eb4fda5397cc0c01c6de41d0d --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java (.../VoteMonitoringAction.java) (revision 5b769706d761b4bd00911b062a4b01061ef2c506) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java (.../VoteMonitoringAction.java) (revision 796f0357fbc2197eb4fda5397cc0c01c6de41d0d) @@ -188,6 +188,7 @@ public void refreshSummaryData(HttpServletRequest request, VoteContent voteContent, IVoteService voteService, boolean isUserNamesVisible, boolean isLearnerRequest, String currentSessionId, String userId, boolean showUserEntriesBySession) { + logger.debug("doing refreshSummaryData."); if (voteService == null) { logger.debug("will retrieve voteService"); @@ -236,7 +237,15 @@ request.getSession().setAttribute(CURRENT_MONITORED_TOOL_SESSION, "All"); logger.debug("CURRENT_MONITORED_TOOL_SESSION: " + request.getSession().getAttribute(CURRENT_MONITORED_TOOL_SESSION)); + logger.debug("currentSessionId: " + currentSessionId); + if ((currentSessionId != null) && (!currentSessionId.equals("All"))) + { + VoteSession voteSession= voteService.retrieveVoteSession(new Long(currentSessionId)); + logger.debug("voteSession:" + voteSession); + request.getSession().setAttribute(GROUP_NAME,voteSession.getSession_name()); + } + logger.debug("using allUsersData to retrieve data: " + isUserNamesVisible); List listMonitoredAnswersContainerDTO=MonitoringUtil.buildGroupsQuestionData(request, voteContent, isUserNamesVisible, isLearnerRequest, currentSessionId, userId, voteService); @@ -248,7 +257,13 @@ List listUserEntries=processUserEnteredNominations(voteService, voteContent, currentSessionId, showUserEntriesBySession, userId, isLearnerRequest); logger.debug("listUserEntries: " + listUserEntries); - request.getSession().setAttribute(LIST_USER_ENTRIES, listUserEntries); + request.getSession().setAttribute(LIST_USER_ENTRIES, listUserEntries); + request.getSession().setAttribute(EXISTS_OPEN_VOTES, new Boolean(false).toString()); + if (listUserEntries.size() > 0) + { + request.getSession().setAttribute(EXISTS_OPEN_VOTES, new Boolean(true).toString()); + } + } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringForm.java =================================================================== diff -u -r22789974b076931e27e1e37ed7d91bd17f4f9cb6 -r796f0357fbc2197eb4fda5397cc0c01c6de41d0d --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringForm.java (.../VoteMonitoringForm.java) (revision 22789974b076931e27e1e37ed7d91bd17f4f9cb6) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringForm.java (.../VoteMonitoringForm.java) (revision 796f0357fbc2197eb4fda5397cc0c01c6de41d0d) @@ -56,8 +56,10 @@ protected String currentUid; + protected String existsOpenVotes; + /** * @return Returns the currentUid. */ @@ -205,4 +207,16 @@ String completedSessionUserPercent) { this.completedSessionUserPercent = completedSessionUserPercent; } + /** + * @return Returns the existsOpenVotes. + */ + public String getExistsOpenVotes() { + return existsOpenVotes; + } + /** + * @param existsOpenVotes The existsOpenVotes to set. + */ + public void setExistsOpenVotes(String existsOpenVotes) { + this.existsOpenVotes = existsOpenVotes; + } } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java =================================================================== diff -u -r6337b44d0387e4f1bb2c1a7511a483e3b2f6fb86 -r796f0357fbc2197eb4fda5397cc0c01c6de41d0d --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java (.../VoteMonitoringStarterAction.java) (revision 6337b44d0387e4f1bb2c1a7511a483e3b2f6fb86) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java (.../VoteMonitoringStarterAction.java) (revision 796f0357fbc2197eb4fda5397cc0c01c6de41d0d) @@ -249,6 +249,7 @@ voteMonitoringAction.refreshInstructionsData(request, voteContent, voteService); logger.debug("end initializing monitoring data..."); + request.getSession().setAttribute(EXISTS_OPEN_VOTES, new Boolean(false).toString()); return true; } Index: lams_tool_vote/web/monitoring/AllSessionsSummary.jsp =================================================================== diff -u -r168d3aadc7610e2b46667fe0c1200f164ee4cf4c -r796f0357fbc2197eb4fda5397cc0c01c6de41d0d --- lams_tool_vote/web/monitoring/AllSessionsSummary.jsp (.../AllSessionsSummary.jsp) (revision 168d3aadc7610e2b46667fe0c1200f164ee4cf4c) +++ lams_tool_vote/web/monitoring/AllSessionsSummary.jsp (.../AllSessionsSummary.jsp) (revision 796f0357fbc2197eb4fda5397cc0c01c6de41d0d) @@ -53,12 +53,17 @@ -    + - - - + + + + + + + + @@ -75,25 +80,25 @@ - + - + - - -
  
-   +
  
- +
@@ -154,88 +159,97 @@ - + - - - - - - - - - + + + + + + + + + +
  
  
- - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + +
- -
- - - - - - - - - - - + + +
+ + + + + + + + + + + + + + + + + + + + + - - - - - -
+ +
+ - - - - -
- 		+ + + + + + + + + + + +
+
+
- - - - - + + - + + Index: lams_tool_vote/web/monitoring/IndividualSessionSummary.jsp =================================================================== diff -u -r168d3aadc7610e2b46667fe0c1200f164ee4cf4c -r796f0357fbc2197eb4fda5397cc0c01c6de41d0d --- lams_tool_vote/web/monitoring/IndividualSessionSummary.jsp (.../IndividualSessionSummary.jsp) (revision 168d3aadc7610e2b46667fe0c1200f164ee4cf4c) +++ lams_tool_vote/web/monitoring/IndividualSessionSummary.jsp (.../IndividualSessionSummary.jsp) (revision 796f0357fbc2197eb4fda5397cc0c01c6de41d0d) @@ -52,9 +52,14 @@ -    + + + + + + @@ -68,18 +73,18 @@ -    + -   + -    + @@ -147,80 +152,82 @@ -    + - -
- - - -    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - + + + + + + + + + + + + + + +
- -
- - - - - - - - - - - + +
+ + + + + + + + + + + + + + + + + + + + + - - - - - -
+ +
+ - - - - -
-
+ + + + + + + + + + + +
+ + + -