Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dto/ChatDTO.java =================================================================== diff -u -r166aa0735bb84ddebe9848373512a69abb3726de -r41a8f54fc41167091b0031f6bc8998298745f6d8 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dto/ChatDTO.java (.../ChatDTO.java) (revision 166aa0735bb84ddebe9848373512a69abb3726de) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dto/ChatDTO.java (.../ChatDTO.java) (revision 41a8f54fc41167091b0031f6bc8998298745f6d8) @@ -56,6 +56,10 @@ public boolean lockOnFinish; + public boolean filteringEnabled; + + public String filteredKeyWords; + public String reflectInstructions; public Set onlineInstructionsFiles = new TreeSet(); @@ -76,7 +80,9 @@ reflectInstructions = chat.getReflectInstructions(); reflectOnActivity = chat.isReflectOnActivity(); lockOnFinish = chat.isLockOnFinished(); - + filteringEnabled = chat.isFilteringEnabled(); + filteredKeyWords = chat.getFilterKeywords(); + for (Iterator i = chat.getChatAttachments().iterator(); i.hasNext();) { ChatAttachment att = (ChatAttachment) i.next(); if (att.getFileType().equals(IToolContentHandler.TYPE_OFFLINE)) { @@ -207,4 +213,20 @@ public void setCurrentTab(Long currentTab) { this.currentTab = currentTab; } + + public boolean isFilteringEnabled() { + return filteringEnabled; + } + + public void setFilteringEnabled(boolean filteringEnabled) { + this.filteringEnabled = filteringEnabled; + } + + public String getFilteredKeyWords() { + return filteredKeyWords; + } + + public void setFilteredKeyWords(String filteredKeyWords) { + this.filteredKeyWords = filteredKeyWords; + } } \ No newline at end of file Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/MonitoringAction.java =================================================================== diff -u -r166aa0735bb84ddebe9848373512a69abb3726de -r41a8f54fc41167091b0031f6bc8998298745f6d8 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 166aa0735bb84ddebe9848373512a69abb3726de) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 41a8f54fc41167091b0031f6bc8998298745f6d8) @@ -94,7 +94,7 @@ Chat chat = chatService.getChatByContentId(toolContentID); ChatDTO chatDTO = new ChatDTO(chat); - Long currentTab = WebUtil.readLongParam(request, AttributeNames.PARAM_CURRENT_TAB,true); + Long currentTab = WebUtil.readLongParam(request, AttributeNames.PARAM_CURRENT_TAB,true); chatDTO.setCurrentTab(currentTab); Map sessCountMap = chatService Index: lams_tool_chat/web/pages/monitoring/summary.jsp =================================================================== diff -u -ra3fa9d47a50a02348e23d312f82f181151573a5c -r41a8f54fc41167091b0031f6bc8998298745f6d8 --- lams_tool_chat/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision a3fa9d47a50a02348e23d312f82f181151573a5c) +++ lams_tool_chat/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 41a8f54fc41167091b0031f6bc8998298745f6d8) @@ -1,5 +1,99 @@ <%@ include file="/common/taglibs.jsp"%> +