Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java
===================================================================
diff -u -r22789974b076931e27e1e37ed7d91bd17f4f9cb6 -r29bab925f2d52a03638949fa5f1e7f08a0767100
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java (.../VoteUtils.java) (revision 22789974b076931e27e1e37ed7d91bd17f4f9cb6)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteUtils.java (.../VoteUtils.java) (revision 29bab925f2d52a03638949fa5f1e7f08a0767100)
@@ -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
===================================================================
diff -u -r4ca13e684e012f8917f07a4ea8121c5c35d0ac4e -r29bab925f2d52a03638949fa5f1e7f08a0767100
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java (.../MonitoringUtil.java) (revision 4ca13e684e012f8917f07a4ea8121c5c35d0ac4e)
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java (.../MonitoringUtil.java) (revision 29bab925f2d52a03638949fa5f1e7f08a0767100)
@@ -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
===================================================================
diff -u
--- lams_tool_vote/web/monitoring/AllSessionsSummary.jsp (revision 0)
+++ lams_tool_vote/web/monitoring/AllSessionsSummary.jsp (revision 29bab925f2d52a03638949fa5f1e7f08a0767100)
@@ -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
===================================================================
diff -u
--- lams_tool_vote/web/monitoring/IndividualSessionSummary.jsp (revision 0)
+++ lams_tool_vote/web/monitoring/IndividualSessionSummary.jsp (revision 29bab925f2d52a03638949fa5f1e7f08a0767100)
@@ -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
===================================================================
diff -u -r4ca13e684e012f8917f07a4ea8121c5c35d0ac4e -r29bab925f2d52a03638949fa5f1e7f08a0767100
--- lams_tool_vote/web/monitoring/Stats.jsp (.../Stats.jsp) (revision 4ca13e684e012f8917f07a4ea8121c5c35d0ac4e)
+++ lams_tool_vote/web/monitoring/Stats.jsp (.../Stats.jsp) (revision 29bab925f2d52a03638949fa5f1e7f08a0767100)
@@ -44,7 +44,13 @@
-
+
+
+
+
+
+
+
Index: lams_tool_vote/web/monitoring/SummaryContent.jsp
===================================================================
diff -u -r6337b44d0387e4f1bb2c1a7511a483e3b2f6fb86 -r29bab925f2d52a03638949fa5f1e7f08a0767100
--- lams_tool_vote/web/monitoring/SummaryContent.jsp (.../SummaryContent.jsp) (revision 6337b44d0387e4f1bb2c1a7511a483e3b2f6fb86)
+++ lams_tool_vote/web/monitoring/SummaryContent.jsp (.../SummaryContent.jsp) (revision 29bab925f2d52a03638949fa5f1e7f08a0767100)
@@ -43,8 +43,12 @@
-
+
+
+
+
+
+
+
-
-
Fisheye: Tag 29bab925f2d52a03638949fa5f1e7f08a0767100 refers to a dead (removed) revision in file `lams_tool_vote/web/monitoring/SummaryStatsCommon.jsp'.
Fisheye: No comparison available. Pass `N' to diff?