Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/Attic/VoteUtils.java,v diff -u -r1.8 -r1.9 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java 23 May 2006 12:48:53 -0000 1.8 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java 27 May 2006 19:19:33 -0000 1.9 @@ -203,9 +203,37 @@ voteAuthoringForm.setMaxNominationCount(maxNomcount); } - + + public static String stripFCKTags(String htmlText) + { + logger.debug("stripping html text: " + htmlText); + String noHTMLText = htmlText.replaceAll("\\<.*?\\>","").replaceAll(" ","").replaceAll("&#[0-9][0-9][0-9][0-9];",""); + logger.debug("noHTMLText: " + noHTMLText); + + String[] htmlTokens = noHTMLText.split("\n"); + logger.debug("htmlTokens: " + htmlTokens); + logger.debug("htmlTokens: " + htmlTokens.length); + String noHtmlNoNewLineTitle=""; + for (int i=0; i < htmlTokens.length ; i++) + { + logger.debug("htmltoken: " + htmlTokens[i]); + if (!htmlTokens[i].trim().equals("")) + { + noHtmlNoNewLineTitle= noHtmlNoNewLineTitle + " " + htmlTokens[i]; + } + } + logger.debug("final noHtmlNoNewLineTitle: " + noHtmlNoNewLineTitle); + + if (noHtmlNoNewLineTitle.length() > 30) + return noHtmlNoNewLineTitle.substring(0,31); + + return noHtmlNoNewLineTitle; + } + + public static void persistRichText(HttpServletRequest request) { + logger.debug("doing persistRichText: "); String richTextTitle = request.getParameter(TITLE); String richTextInstructions = request.getParameter(INSTRUCTIONS); @@ -217,6 +245,10 @@ { request.getSession().setAttribute(ACTIVITY_TITLE, richTextTitle); } + String noHTMLTitle = stripFCKTags(richTextTitle); + logger.debug("noHTMLTitle: " + noHTMLTitle); + + if (richTextInstructions != null) { Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java,v diff -u -r1.26 -r1.27 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java 26 May 2006 23:06:45 -0000 1.26 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java 27 May 2006 19:19:33 -0000 1.27 @@ -734,7 +734,9 @@ if (voteQueContent != null) { logger.debug("question: " + voteQueContent.getQuestion()); - mapOptionsContent.put(mapIndex.toString(),voteQueContent.getQuestion()); + String noHTMLNomination = VoteUtils.stripFCKTags(voteQueContent.getQuestion()); + logger.debug("noHTMLNomination: " + noHTMLNomination); + mapOptionsContent.put(mapIndex.toString(),noHTMLNomination); int votesCount=0; logger.debug("getting votesCount based on session: " + voteSession.getUid()); @@ -892,7 +894,9 @@ if (voteQueContent != null) { logger.debug("question: " + voteQueContent.getQuestion()); - mapOptionsContent.put(mapIndex.toString(),voteQueContent.getQuestion()); + String noHTMLNomination = VoteUtils.stripFCKTags(voteQueContent.getQuestion()); + logger.debug("noHTMLNomination: " + noHTMLNomination); + mapOptionsContent.put(mapIndex.toString(),noHTMLNomination); int votesCount=0; if (sessionLevelCharting == true) @@ -1039,8 +1043,12 @@ if (voteQueContent != null) { logger.debug("question: " + voteQueContent.getQuestion()); - mapOptionsContent.put(mapIndex.toString(),voteQueContent.getQuestion()); + //mapOptionsContent.put(mapIndex.toString(),voteQueContent.getQuestion()); + String noHTMLNomination = VoteUtils.stripFCKTags(voteQueContent.getQuestion()); + logger.debug("noHTMLNomination: " + noHTMLNomination); + mapOptionsContent.put(mapIndex.toString(),noHTMLNomination); + int votesCount=0; if (sessionLevelCharting == true) { @@ -1186,8 +1194,10 @@ if (voteQueContent != null) { logger.debug("question: " + voteQueContent.getQuestion()); - mapOptionsContent.put(mapIndex.toString(),voteQueContent.getQuestion()); - + String noHTMLNomination = VoteUtils.stripFCKTags(voteQueContent.getQuestion()); + logger.debug("noHTMLNomination: " + noHTMLNomination); + mapOptionsContent.put(mapIndex.toString(),noHTMLNomination); + int votesCount=voteService.getStandardAttemptsForQuestionContentAndContentUid(voteQueContent.getUid(), voteContent.getUid()); logger.debug("standardContentAttemptCount: " + votesCount); Index: lams_tool_vote/web/monitoring/AllSessionsSummary.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/AllSessionsSummary.jsp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_vote/web/monitoring/AllSessionsSummary.jsp 27 May 2006 19:19:33 -0000 1.1 @@ -0,0 +1,241 @@ +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) +License Information: http://lamsfoundation.org/licensing/lams/2.0/ + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + USA + + http://www.gnu.org/licenses/gpl.txt +--%> + + +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-logic" prefix="logic" %> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-fmt" prefix="fmt" %> +<%@ taglib uri="fck-editor" prefix="FCK" %> +<%@ taglib uri="tags-lams" prefix="lams" %> + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +
  
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+  ( ) +
  
+   +
  
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + + + + + + + +  ( ) + + +
+
  
  
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + + + + +
+
+ + +
+ + + + + + Index: lams_tool_vote/web/monitoring/IndividualSessionSummary.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/Attic/IndividualSessionSummary.jsp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_vote/web/monitoring/IndividualSessionSummary.jsp 27 May 2006 19:19:33 -0000 1.1 @@ -0,0 +1,226 @@ +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) +License Information: http://lamsfoundation.org/licensing/lams/2.0/ + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + USA + + http://www.gnu.org/licenses/gpl.txt +--%> + + +<%@ taglib uri="tags-bean" prefix="bean"%> +<%@ taglib uri="tags-html" prefix="html"%> +<%@ taglib uri="tags-logic" prefix="logic" %> +<%@ taglib uri="tags-core" prefix="c"%> +<%@ taglib uri="tags-fmt" prefix="fmt" %> +<%@ taglib uri="fck-editor" prefix="FCK" %> +<%@ taglib uri="tags-lams" prefix="lams" %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ +
  
+  ( ) +
  
+   +
  
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + + + + + + + +  ( ) + + +
+
  
  
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + + + + +
+
+ + + + + Index: lams_tool_vote/web/monitoring/Stats.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/Stats.jsp,v diff -u -r1.5 -r1.6 --- lams_tool_vote/web/monitoring/Stats.jsp 26 May 2006 23:06:45 -0000 1.5 +++ lams_tool_vote/web/monitoring/Stats.jsp 27 May 2006 19:19:33 -0000 1.6 @@ -44,7 +44,13 @@ - + + + + + + + Index: lams_tool_vote/web/monitoring/SummaryContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/SummaryContent.jsp,v diff -u -r1.22 -r1.23 --- lams_tool_vote/web/monitoring/SummaryContent.jsp 26 May 2006 15:28:33 -0000 1.22 +++ lams_tool_vote/web/monitoring/SummaryContent.jsp 27 May 2006 19:19:32 -0000 1.23 @@ -43,8 +43,12 @@ - + + + + + + + - - Fisheye: Tag 1.9 refers to a dead (removed) revision in file `lams_tool_vote/web/monitoring/SummaryStatsCommon.jsp'. Fisheye: No comparison available. Pass `N' to diff?