Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAllSessionsDTO.java =================================================================== diff -u -r4ca13e684e012f8917f07a4ea8121c5c35d0ac4e -r168d3aadc7610e2b46667fe0c1200f164ee4cf4c --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAllSessionsDTO.java (.../VoteAllSessionsDTO.java) (revision 4ca13e684e012f8917f07a4ea8121c5c35d0ac4e) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAllSessionsDTO.java (.../VoteAllSessionsDTO.java) (revision 168d3aadc7610e2b46667fe0c1200f164ee4cf4c) @@ -40,6 +40,7 @@ private String completedSessionUserPercent; private String sessionId; private Map mapStandardNominationsContent; + private Map mapStandardNominationsHTMLedContent; private Map mapStandardUserCount; private Map mapStandardRatesContent; private List listUserEntries; @@ -159,4 +160,17 @@ Map mapStandardNominationsContent) { this.mapStandardNominationsContent = mapStandardNominationsContent; } + /** + * @return Returns the mapStandardNominationsHTMLedContent. + */ + public Map getMapStandardNominationsHTMLedContent() { + return mapStandardNominationsHTMLedContent; + } + /** + * @param mapStandardNominationsHTMLedContent The mapStandardNominationsHTMLedContent to set. + */ + public void setMapStandardNominationsHTMLedContent( + Map mapStandardNominationsHTMLedContent) { + this.mapStandardNominationsHTMLedContent = mapStandardNominationsHTMLedContent; + } } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java =================================================================== diff -u -r6337b44d0387e4f1bb2c1a7511a483e3b2f6fb86 -r168d3aadc7610e2b46667fe0c1200f164ee4cf4c --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java (.../VoteAppConstants.java) (revision 6337b44d0387e4f1bb2c1a7511a483e3b2f6fb86) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java (.../VoteAppConstants.java) (revision 168d3aadc7610e2b46667fe0c1200f164ee4cf4c) @@ -114,6 +114,7 @@ public static final String MAP_STANDARD_USER_COUNT ="mapStandardUserCount"; public static final String MAP_STANDARD_NOMINATIONS_VISIBILITY ="mapStandardNominationsVisibility"; public static final String MAP_STANDARD_NOMINATIONS_CONTENT ="mapStandardNominationsContent"; + public static final String MAP_STANDARD_NOMINATIONS_HTMLED_CONTENT ="mapStandardNominationsHTMLedContent"; public static final String MAP_STANDARD_RATES_CONTENT ="mapStandardRatesContent"; public static final String MAP_OPTIONS_CONTENT_FCK ="mapOptionsContentFck"; public static final String MAP_DEFAULTOPTIONS_CONTENT ="mapDefaultOptionsContent"; Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java =================================================================== diff -u -rfaedd9b476d973334d6e6c963aefa3cf4bd79ef5 -r168d3aadc7610e2b46667fe0c1200f164ee4cf4c --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java (.../VoteUtils.java) (revision faedd9b476d973334d6e6c963aefa3cf4bd79ef5) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java (.../VoteUtils.java) (revision 168d3aadc7610e2b46667fe0c1200f164ee4cf4c) @@ -204,7 +204,7 @@ } - public static String stripFCKTags(String htmlText) + public static String stripHTML(String htmlText) { String noHTMLText = htmlText.replaceAll("\\<.*?\\>","").replaceAll(" ","").replaceAll("&#[0-9][0-9][0-9][0-9];",""); String[] htmlTokens = noHTMLText.split("\n"); @@ -217,6 +217,17 @@ } } + logger.debug("trimmed noHtmlNoNewLineStr: " + noHtmlNoNewLineStr.trim()); + if (noHtmlNoNewLineStr.trim().equals("")) + { + logger.debug("nomination text is just composed of html markup..." + + "returning html formatted text"); + if (htmlText.length() > 50) + return htmlText.substring(0,51); + else + return htmlText; + } + if (noHtmlNoNewLineStr.length() > 50) return noHtmlNoNewLineStr.substring(0,51); @@ -238,9 +249,8 @@ { request.getSession().setAttribute(ACTIVITY_TITLE, richTextTitle); } - String noHTMLTitle = stripFCKTags(richTextTitle); + String noHTMLTitle = stripHTML(richTextTitle); logger.debug("noHTMLTitle: " + noHTMLTitle); - if (richTextInstructions != null) Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java =================================================================== diff -u -r5b769706d761b4bd00911b062a4b01061ef2c506 -r168d3aadc7610e2b46667fe0c1200f164ee4cf4c --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java (.../MonitoringUtil.java) (revision 5b769706d761b4bd00911b062a4b01061ef2c506) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java (.../MonitoringUtil.java) (revision 168d3aadc7610e2b46667fe0c1200f164ee4cf4c) @@ -660,7 +660,14 @@ return map; } - + /** + * Generates JFreeChart data for all sessions in the Monitoring Summary. + * @param request + * @param voteService + * @param voteMonitoringForm + * @param toolContentId + * @return + */ public static List prepareChartDTO(HttpServletRequest request, IVoteService voteService, VoteMonitoringForm voteMonitoringForm, Long toolContentId) { logger.debug("start preparing ChartDTO with voteMonitoringForm: " + voteMonitoringForm); @@ -727,14 +734,15 @@ int totalStandardVotesCount=0; logger.debug("using entriesCount: " + entriesCount); - + Map mapStandardNominationsHTMLedContent= new TreeMap(new VoteComparator()); while (queIterator.hasNext()) { VoteQueContent voteQueContent=(VoteQueContent) queIterator.next(); if (voteQueContent != null) { logger.debug("question: " + voteQueContent.getQuestion()); - String noHTMLNomination = VoteUtils.stripFCKTags(voteQueContent.getQuestion()); + mapStandardNominationsHTMLedContent.put(mapIndex.toString(),voteQueContent.getQuestion()); + String noHTMLNomination = VoteUtils.stripHTML(voteQueContent.getQuestion()); logger.debug("noHTMLNomination: " + noHTMLNomination); mapOptionsContent.put(mapIndex.toString(),noHTMLNomination); @@ -762,6 +770,7 @@ Map mapStandardNominationsContent= new TreeMap(new VoteComparator()); mapStandardNominationsContent=mapOptionsContent; logger.debug("mapStandardNominationsContent: " + mapStandardNominationsContent); + logger.debug("mapStandardNominationsHTMLedContent: " + mapStandardNominationsHTMLedContent); Map mapStandardRatesContent= new TreeMap(new VoteComparator()); mapStandardRatesContent=mapVoteRatesContent; @@ -784,14 +793,17 @@ logger.debug("userEnteredVotesCount for this session: " + userEnteredVotesCount); 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()); + + logger.debug("processed for prepareChartDTO: mapStandardNominationsContent: " + mapStandardNominationsContent); + logger.debug("processed for prepareChartDTO: mapStandardNominationsHTMLedContent: " + mapStandardNominationsHTMLedContent); + logger.debug("processed for prepareChartDTO: mapStandardUserCount: " + mapStandardUserCount); + logger.debug("processed for prepareChartDTO: mapStandardRatesContent: " + mapStandardRatesContent); - logger.debug("processed for prepareChartDTO: MAP_STANDARD_NOMINATIONS_CONTENT: " + request.getSession().getAttribute(MAP_STANDARD_NOMINATIONS_CONTENT)); - logger.debug("processed for prepareChartDTO: MAP_STANDARD_RATES_CONTENT: " + request.getSession().getAttribute(MAP_STANDARD_RATES_CONTENT)); - logger.debug("processed for prepareChartDTO: MAP_STANDARD_USER_COUNT: " + request.getSession().getAttribute(MAP_STANDARD_USER_COUNT)); - voteAllSessionsDTO.setMapStandardNominationsContent(mapStandardNominationsContent); + voteAllSessionsDTO.setMapStandardNominationsHTMLedContent(mapStandardNominationsHTMLedContent); voteAllSessionsDTO.setMapStandardUserCount(mapStandardUserCount); voteAllSessionsDTO.setMapStandardRatesContent(mapStandardRatesContent); @@ -808,7 +820,8 @@ } /** - * generates JFreeChart for the learner module + * Generates JFreeChart data for the learner module and + * monitoring module Summary tab (Individual Sessions mode) * * @param request * @param voteService @@ -888,13 +901,15 @@ logger.debug("using entriesCount: " + entriesCount); + Map mapStandardNominationsHTMLedContent= new TreeMap(new VoteComparator()); while (queIterator.hasNext()) { VoteQueContent voteQueContent=(VoteQueContent) queIterator.next(); if (voteQueContent != null) { logger.debug("question: " + voteQueContent.getQuestion()); - String noHTMLNomination = VoteUtils.stripFCKTags(voteQueContent.getQuestion()); + mapStandardNominationsHTMLedContent.put(mapIndex.toString(), voteQueContent.getQuestion()); + String noHTMLNomination = VoteUtils.stripHTML(voteQueContent.getQuestion()); logger.debug("noHTMLNomination: " + noHTMLNomination); mapOptionsContent.put(mapIndex.toString(),noHTMLNomination); @@ -926,10 +941,12 @@ mapIndex=new Long(mapIndex.longValue()+1); } } + logger.debug("test1: Map initialized with existing contentid to: " + mapOptionsContent); Map mapStandardNominationsContent= new TreeMap(new VoteComparator()); mapStandardNominationsContent=mapOptionsContent; logger.debug("mapStandardNominationsContent: " + mapStandardNominationsContent); + logger.debug("mapStandardNominationsHTMLedContent: " + mapStandardNominationsHTMLedContent); Map mapStandardRatesContent= new TreeMap(new VoteComparator()); mapStandardRatesContent=mapVoteRatesContent; @@ -952,11 +969,15 @@ logger.debug("userEnteredVotesCount for this session: " + userEnteredVotesCount); 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()); request.getSession().setAttribute(MAP_STANDARD_NOMINATIONS_CONTENT, mapStandardNominationsContent); logger.debug("test2: MAP_STANDARD_NOMINATIONS_CONTENT: " + request.getSession().getAttribute(MAP_STANDARD_NOMINATIONS_CONTENT)); + + request.getSession().setAttribute(MAP_STANDARD_NOMINATIONS_HTMLED_CONTENT, mapStandardNominationsHTMLedContent); + logger.debug("test2: MAP_STANDARD_NOMINATIONS_HTMLED_CONTENT: " + request.getSession().getAttribute(MAP_STANDARD_NOMINATIONS_HTMLED_CONTENT)); request.getSession().setAttribute(MAP_STANDARD_RATES_CONTENT, mapStandardRatesContent); logger.debug("test2: MAP_STANDARD_RATES_CONTENT: " + request.getSession().getAttribute(MAP_STANDARD_RATES_CONTENT)); @@ -1036,14 +1057,15 @@ int totalStandardVotesCount=0; logger.debug("using entriesCount: " + entriesCount); - + Map mapStandardNominationsHTMLedContent= new TreeMap(new VoteComparator()); while (queIterator.hasNext()) { VoteQueContent voteQueContent=(VoteQueContent) queIterator.next(); if (voteQueContent != null) { logger.debug("question: " + voteQueContent.getQuestion()); - String noHTMLNomination = VoteUtils.stripFCKTags(voteQueContent.getQuestion()); + mapStandardNominationsHTMLedContent.put(mapIndex.toString(),voteQueContent.getQuestion()); + String noHTMLNomination = VoteUtils.stripHTML(voteQueContent.getQuestion()); logger.debug("noHTMLNomination: " + noHTMLNomination); mapOptionsContent.put(mapIndex.toString(),noHTMLNomination); @@ -1082,6 +1104,7 @@ Map mapStandardNominationsContent= new TreeMap(new VoteComparator()); mapStandardNominationsContent=mapOptionsContent; logger.debug("mapStandardNominationsContent: " + mapStandardNominationsContent); + logger.debug("mapStandardNominationsHTMLedContent: " + mapStandardNominationsHTMLedContent); Map mapStandardRatesContent= new TreeMap(new VoteComparator()); mapStandardRatesContent=mapVoteRatesContent; @@ -1130,12 +1153,16 @@ logger.debug("votesShare: " + votesShare); if (isVoteVisible == true) + { mapStandardNominationsContent.put(mapIndex.toString(), userEntry); + mapStandardNominationsHTMLedContent.put(mapIndex.toString(), userEntry); + } else { String nominationName="Nomination" + mapIndex + " Hidden"; logger.debug("nominationName: " + nominationName); mapStandardNominationsContent.put(mapIndex.toString(), nominationName); + mapStandardNominationsHTMLedContent.put(mapIndex.toString(), nominationName); } mapStandardRatesContent.put(mapIndex.toString(), new Double(votesShare).toString()); @@ -1148,7 +1175,10 @@ request.getSession().setAttribute(MAP_STANDARD_NOMINATIONS_CONTENT, mapStandardNominationsContent); logger.debug("test2: MAP_STANDARD_NOMINATIONS_CONTENT: " + request.getSession().getAttribute(MAP_STANDARD_NOMINATIONS_CONTENT)); - + + request.getSession().setAttribute(MAP_STANDARD_NOMINATIONS_HTMLED_CONTENT, mapStandardNominationsHTMLedContent); + logger.debug("test2: MAP_STANDARD_NOMINATIONS_HTMLED_CONTENT: " + request.getSession().getAttribute(MAP_STANDARD_NOMINATIONS_HTMLED_CONTENT)); + request.getSession().setAttribute(MAP_STANDARD_RATES_CONTENT, mapStandardRatesContent); logger.debug("test2: MAP_STANDARD_RATES_CONTENT: " + request.getSession().getAttribute(MAP_STANDARD_RATES_CONTENT)); @@ -1194,13 +1224,15 @@ entriesCount=setEntriesCount.size(); logger.debug("entriesCount: " + entriesCount); + Map mapStandardNominationsHTMLedContent= new TreeMap(new VoteComparator()); while (queIterator.hasNext()) { VoteQueContent voteQueContent=(VoteQueContent) queIterator.next(); if (voteQueContent != null) { logger.debug("question: " + voteQueContent.getQuestion()); - String noHTMLNomination = VoteUtils.stripFCKTags(voteQueContent.getQuestion()); + mapStandardNominationsHTMLedContent.put(mapIndex.toString(),voteQueContent.getQuestion()); + String noHTMLNomination = VoteUtils.stripHTML(voteQueContent.getQuestion()); logger.debug("noHTMLNomination: " + noHTMLNomination); mapOptionsContent.put(mapIndex.toString(),noHTMLNomination); @@ -1228,6 +1260,7 @@ Map mapStandardNominationsContent= new TreeMap(new VoteComparator()); mapStandardNominationsContent=mapOptionsContent; logger.debug("mapStandardNominationsContent: " + mapStandardNominationsContent); + logger.debug("mapStandardNominationsHTMLedContent: " + mapStandardNominationsHTMLedContent); Map mapStandardRatesContent= new TreeMap(new VoteComparator()); mapStandardRatesContent=mapVoteRatesContent; @@ -1249,13 +1282,16 @@ logger.debug("userEnteredVotesCount for this session: " + userEnteredVotesCount); 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()); - request.getSession().setAttribute(MAP_STANDARD_NOMINATIONS_CONTENT, mapStandardNominationsContent); logger.debug("test2: MAP_STANDARD_NOMINATIONS_CONTENT: " + request.getSession().getAttribute(MAP_STANDARD_NOMINATIONS_CONTENT)); + request.getSession().setAttribute(MAP_STANDARD_NOMINATIONS_HTMLED_CONTENT, mapStandardNominationsHTMLedContent); + logger.debug("test2: MAP_STANDARD_NOMINATIONS_HTMLED_CONTENT: " + request.getSession().getAttribute(MAP_STANDARD_NOMINATIONS_HTMLED_CONTENT)); + request.getSession().setAttribute(MAP_STANDARD_RATES_CONTENT, mapStandardRatesContent); logger.debug("test2: MAP_STANDARD_RATES_CONTENT: " + request.getSession().getAttribute(MAP_STANDARD_RATES_CONTENT)); Index: lams_tool_vote/web/export/ExportContent.jsp =================================================================== diff -u -r7271b17e27d55c5a50ce986d22cc603064fd16b7 -r168d3aadc7610e2b46667fe0c1200f164ee4cf4c --- lams_tool_vote/web/export/ExportContent.jsp (.../ExportContent.jsp) (revision 7271b17e27d55c5a50ce986d22cc603064fd16b7) +++ lams_tool_vote/web/export/ExportContent.jsp (.../ExportContent.jsp) (revision 168d3aadc7610e2b46667fe0c1200f164ee4cf4c) @@ -48,7 +48,7 @@ - + @@ -95,7 +95,7 @@ - + Index: lams_tool_vote/web/monitoring/AllSessionsSummary.jsp =================================================================== diff -u -r29bab925f2d52a03638949fa5f1e7f08a0767100 -r168d3aadc7610e2b46667fe0c1200f164ee4cf4c --- lams_tool_vote/web/monitoring/AllSessionsSummary.jsp (.../AllSessionsSummary.jsp) (revision 29bab925f2d52a03638949fa5f1e7f08a0767100) +++ lams_tool_vote/web/monitoring/AllSessionsSummary.jsp (.../AllSessionsSummary.jsp) (revision 168d3aadc7610e2b46667fe0c1200f164ee4cf4c) @@ -93,7 +93,7 @@ - +
@@ -124,7 +124,7 @@ - + - +
Index: lams_tool_vote/web/monitoring/IndividualSessionSummary.jsp =================================================================== diff -u -r29bab925f2d52a03638949fa5f1e7f08a0767100 -r168d3aadc7610e2b46667fe0c1200f164ee4cf4c --- lams_tool_vote/web/monitoring/IndividualSessionSummary.jsp (.../IndividualSessionSummary.jsp) (revision 29bab925f2d52a03638949fa5f1e7f08a0767100) +++ lams_tool_vote/web/monitoring/IndividualSessionSummary.jsp (.../IndividualSessionSummary.jsp) (revision 168d3aadc7610e2b46667fe0c1200f164ee4cf4c) @@ -117,7 +117,7 @@