Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumReport.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Attic/ForumReport.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumReport.hbm.xml	22 Nov 2005 04:01:13 -0000	1.1
+++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumReport.hbm.xml	30 Nov 2005 03:36:13 -0000	1.2
@@ -43,7 +43,7 @@
 
         <property
             name="mark"
-            type="int"
+            type="java.lang.Float"
             update="true"
             insert="true"
             column="mark"
Index: lams_tool_forum/conf/xdoclet/struts-actions.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/conf/xdoclet/struts-actions.xml,v
diff -u -r1.21 -r1.22
--- lams_tool_forum/conf/xdoclet/struts-actions.xml	24 Nov 2005 06:25:24 -0000	1.21
+++ lams_tool_forum/conf/xdoclet/struts-actions.xml	30 Nov 2005 03:36:13 -0000	1.22
@@ -298,10 +298,11 @@
 			parameter="viewInstructions" >
 			<forward name="success" path="tiles:/monitoring/forum/viewInstructions" />
 		</action>
+		
 		<action path="/monitoring/statistic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
 			parameter="statistic" >
-			<forward name="success" path="tiles:/monitoring/forum/listContentUsers" />
+			<forward name="success" path="tiles:/monitoring/forum/statistic" />
 		</action>
 		
 		<action path="/monitoring/viewTopic"
Index: lams_tool_forum/db/sql/create_lams_tool_forum.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/db/sql/create_lams_tool_forum.sql,v
diff -u -r1.15 -r1.16
--- lams_tool_forum/db/sql/create_lams_tool_forum.sql	23 Nov 2005 04:07:30 -0000	1.15
+++ lams_tool_forum/db/sql/create_lams_tool_forum.sql	30 Nov 2005 03:36:13 -0000	1.16
@@ -4,21 +4,8 @@
 drop table if exists tl_lafrum11_forum_user;
 drop table if exists tl_lafrum11_message;
 drop table if exists tl_lafrum11_message_seq;
-drop table if exists tl_lafrum11_tool_session;
-drop table if exists tl_lafrum11_attachment;
-drop table if exists tl_lafrum11_forum;
-drop table if exists tl_lafrum11_forum_user;
-drop table if exists tl_lafrum11_message;
-drop table if exists tl_lafrum11_message_seq;
 drop table if exists tl_lafrum11_report;
 drop table if exists tl_lafrum11_tool_session;
-drop table if exists tl_lafrum11_attachment;
-drop table if exists tl_lafrum11_forum;
-drop table if exists tl_lafrum11_forum_user;
-drop table if exists tl_lafrum11_message;
-drop table if exists tl_lafrum11_message_seq;
-drop table if exists tl_lafrum11_report;
-drop table if exists tl_lafrum11_tool_session;
 create table tl_lafrum11_attachment (
    uid bigint not null auto_increment,
    file_version_id bigint,
@@ -88,7 +75,7 @@
    uid bigint not null auto_increment,
    comment text,
    release_date datetime,
-   mark integer,
+   mark float,
    primary key (uid)
 );
 create table tl_lafrum11_tool_session (
Index: lams_tool_forum/db/sql/table-schema.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/db/sql/table-schema.sql,v
diff -u -r1.12 -r1.13
--- lams_tool_forum/db/sql/table-schema.sql	23 Nov 2005 04:07:30 -0000	1.12
+++ lams_tool_forum/db/sql/table-schema.sql	30 Nov 2005 03:36:13 -0000	1.13
@@ -86,7 +86,7 @@
    uid bigint not null auto_increment,
    comment text,
    release_date datetime,
-   mark integer,
+   mark float,
    primary key (uid)
 );
 create table tl_lafrum11_tool_session (
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/MessageDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/MessageDTO.java,v
diff -u -r1.7 -r1.8
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/MessageDTO.java	15 Nov 2005 05:57:42 -0000	1.7
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/MessageDTO.java	30 Nov 2005 03:36:14 -0000	1.8
@@ -24,6 +24,7 @@
 import java.util.Iterator;
 import java.util.List;
 
+import org.lamsfoundation.lams.tool.forum.persistence.ForumReport;
 import org.lamsfoundation.lams.tool.forum.persistence.Message;
 
 
@@ -35,6 +36,8 @@
 	private short level;
 	private int threadNum;
 	private boolean isAuthor;
+	private Float mark;
+
 	/**
 	 * Get a <code>MessageDTO</code> instance from a given <code>Message</code>.
 	 * 
@@ -52,7 +55,11 @@
 			dto.setHasAttachment(false);
 		else
 			dto.setHasAttachment(true);
-				
+		
+		ForumReport report = msg.getReport();
+		if(report != null && report.getMark() != null)
+			dto.mark = report.getMark();
+		
 		return dto;
 	}
 
@@ -70,12 +77,16 @@
 		while(iter.hasNext()){
 			Message msg = (Message) iter.next();
 			MessageDTO msgDto = new MessageDTO();
+			msgDto.setMessage(msg);
+			msgDto.setAuthor(msg.getCreatedBy().getFirstName()+" "+msg.getCreatedBy().getLastName());
+			
 			if(msg.getAttachments() == null || msg.getAttachments().isEmpty())
 				msgDto.setHasAttachment(false);
 			else
 				msgDto.setHasAttachment(true);
-			msgDto.setMessage(msg);
-			msgDto.setAuthor(msg.getCreatedBy().getFirstName()+" "+msg.getCreatedBy().getLastName());
+			ForumReport report = msg.getReport();
+			if(report != null && report.getMark() != null)
+				msgDto.mark = report.getMark();
 
 			retSet.add(msgDto);
 		}
@@ -121,4 +132,11 @@
 		this.isAuthor = isAuthor;
 	}
 	
+	public Float getMark() {
+		return mark;
+	}
+
+	public void setMark(Float mark) {
+		this.mark = mark;
+	}	
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumReport.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Attic/ForumReport.hbm.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumReport.hbm.xml	22 Nov 2005 04:01:13 -0000	1.1
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumReport.hbm.xml	30 Nov 2005 03:36:13 -0000	1.2
@@ -43,7 +43,7 @@
 
         <property
             name="mark"
-            type="int"
+            type="java.lang.Float"
             update="true"
             insert="true"
             column="mark"
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumReport.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumReport.java,v
diff -u -r1.1 -r1.2
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumReport.java	22 Nov 2005 04:01:13 -0000	1.1
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumReport.java	30 Nov 2005 03:36:13 -0000	1.2
@@ -30,7 +30,7 @@
 public class ForumReport {
 	
 	private Long uid;
-	private int mark;
+	private Float mark;
 	private String comment;
 	private Date dateMarksReleased;
     /**
@@ -66,10 +66,10 @@
 	 * @hibernate.property column="mark" 
 	 * @return
 	 */
-	public int getMark() {
+	public Float getMark() {
 		return mark;
 	}
-	public void setMark(int mark) {
+	public void setMark(Float mark) {
 		this.mark = mark;
 	}
 
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUser.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUser.java,v
diff -u -r1.7 -r1.8
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUser.java	23 Nov 2005 04:07:30 -0000	1.7
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUser.java	30 Nov 2005 03:36:13 -0000	1.8
@@ -22,6 +22,8 @@
 
 import java.io.Serializable;
 
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.apache.log4j.Logger;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 /**
@@ -152,4 +154,23 @@
 		this.loginName = loginName;
 	}
 
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (!(obj instanceof ForumUser))
+			return false;
+
+		final ForumUser user = (ForumUser) obj;
+		
+		return new EqualsBuilder().append(this.uid, user.uid).append(this.firstName, user.firstName)
+			.append(this.lastName,user.lastName).append(this.loginName, user.loginName).isEquals();
+		
+	}
+
+	public int hashCode() {
+		return new HashCodeBuilder().append(uid).append(firstName)
+		.append(lastName).append(loginName)
+		.toHashCode();
+	}
+
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java,v
diff -u -r1.26 -r1.27
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	24 Nov 2005 06:25:24 -0000	1.26
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	30 Nov 2005 03:36:14 -0000	1.27
@@ -348,41 +348,7 @@
 		return forumUserDao.getBySessionId(sessionID);
 	}
 
-
     //***************************************************************************************************************
-    // ToolContentManager and ToolSessionManager methods
-    //***************************************************************************************************************
-	public void copyToolContent(Long fromContentId, Long toContentId) throws ToolException {
-	}
-
-	public void setAsDefineLater(Long toolContentId) throws DataMissingException, ToolException {
-	}
-
-	public void setAsRunOffline(Long toolContentId) throws DataMissingException, ToolException {
-	}
-
-	public void removeToolContent(Long toolContentId, boolean removeSessionData) throws SessionDataExistsException, ToolException {
-	}
-
-	public void createToolSession(Long toolSessionId, Long toolContentId) throws ToolException {
-	}
-
-	public String leaveToolSession(Long toolSessionId, Long learnerId) throws DataMissingException, ToolException {
-		return null;
-	}
-
-	public ToolSessionExportOutputData exportToolSession(Long toolSessionId) throws DataMissingException, ToolException {
-		return null;
-	}
-
-	public ToolSessionExportOutputData exportToolSession(List toolSessionIds) throws DataMissingException, ToolException {
-		return null;
-	}
-
-	public void removeToolSession(Long toolSessionId) throws DataMissingException, ToolException {
-	}
-
-    //***************************************************************************************************************
     // Private methods
     //***************************************************************************************************************
 	/**
@@ -471,7 +437,53 @@
 		return forumUserDao.getByUid(userUid);
 	}
 
+	public void releaseMarksForSession(Long sessionID) {
+		List list = messageDao.getBySession(sessionID);
+		Iterator iter = list.iterator();
+		while(iter.hasNext()){
+			Message msg = (Message) iter.next();
+			ForumReport report = msg.getReport();
+			if(report != null)
+				report.setDateMarksReleased(new Date());
+			messageDao.saveOrUpdate(msg);
+		}
+	}
+
+
     //***************************************************************************************************************
+    // ToolContentManager and ToolSessionManager methods
+    //***************************************************************************************************************
+	public void copyToolContent(Long fromContentId, Long toContentId) throws ToolException {
+	}
+
+	public void setAsDefineLater(Long toolContentId) throws DataMissingException, ToolException {
+	}
+
+	public void setAsRunOffline(Long toolContentId) throws DataMissingException, ToolException {
+	}
+
+	public void removeToolContent(Long toolContentId, boolean removeSessionData) throws SessionDataExistsException, ToolException {
+	}
+
+	public void createToolSession(Long toolSessionId, Long toolContentId) throws ToolException {
+	}
+
+	public String leaveToolSession(Long toolSessionId, Long learnerId) throws DataMissingException, ToolException {
+		return null;
+	}
+
+	public ToolSessionExportOutputData exportToolSession(Long toolSessionId) throws DataMissingException, ToolException {
+		return null;
+	}
+
+	public ToolSessionExportOutputData exportToolSession(List toolSessionIds) throws DataMissingException, ToolException {
+		return null;
+	}
+
+	public void removeToolSession(Long toolSessionId) throws DataMissingException, ToolException {
+	}
+	
+    //***************************************************************************************************************
     // Get / Set methods
     //***************************************************************************************************************
 	public ILamsToolService getToolService() {
@@ -546,16 +558,5 @@
 		this.forumToolContentHandler = toolContentHandler;
 	}
 
-	public void releaseMarksForSession(Long sessionID) {
-		List list = messageDao.getBySession(sessionID);
-		Iterator iter = list.iterator();
-		while(iter.hasNext()){
-			Message msg = (Message) iter.next();
-			ForumReport report = msg.getReport();
-			if(report != null)
-				report.setDateMarksReleased(new Date());
-			messageDao.saveOrUpdate(msg);
-		}
-	}
 
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/Attic/ApplicationResources.properties,v
diff -u -r1.14 -r1.15
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/ApplicationResources.properties	24 Nov 2005 06:25:24 -0000	1.14
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/ApplicationResources.properties	30 Nov 2005 03:36:13 -0000	1.15
@@ -34,13 +34,17 @@
 lable.topic.title.author=Author
 lable.topic.title.startedby=Start by
 lable.topic.title.replies=Replies
+lable.topic.title.mark=Mark
 lable.topic.subject.by=By
 label.back.to.forum=Go back to froum
 
 label.monitoring.edit.activity.cancel=Cancel
 label.monitoring.edit.activity.update=Update
 label.monitoring.edit.activity.edit=Edit
-
+lable.topic.title.message.number=# of Msg
+lable.topic.title.average.mark= Aver mark
+label.monitoring.statistic.average.mark= Average message mark
+lable.monitoring.statistic.total.message=# of total message
 authoring.exception= There is a problem in forum authoring page, the reason is {0}
 #-------------------------END Authoring Labels END-----------------#
 page.title.monitoring.content.userlist=Monitoring User List
@@ -50,6 +54,7 @@
 page.title.monitoring.edit.activity=Edit Activity
 page.title.monitoring.view.instructions=View Instructions
 page.title.monitoring.view.topic=View topic
+page.title.monitoring.statistic=Statistic
 ## errors
 errors.header=<b class="error">
 errors.footer=</b>
@@ -59,7 +64,7 @@
 error.inputFileTooLarge = Input File size is too large!
 error.uploading = error uploading
 error.mark.needNumber= Mark must be int value
-error.mark.needInteger= Mark must be int value
+error.mark.invalid.number= Mark is invalid number format
 error.fail.get.forum=No Forum available
 error.title.empty=Title can not be blank
 #General Messages
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java,v
diff -u -r1.6 -r1.7
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java	24 Nov 2005 06:25:24 -0000	1.6
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java	30 Nov 2005 03:36:13 -0000	1.7
@@ -23,6 +23,8 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.text.DateFormat;
+import java.text.FieldPosition;
+import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -33,7 +35,6 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.math.NumberUtils;
 import org.apache.log4j.Logger;
 import org.apache.poi.hssf.usermodel.HSSFCell;
 import org.apache.poi.hssf.usermodel.HSSFRow;
@@ -234,8 +235,9 @@
 					
 					cell = row1.createCell((short) idx++);
 					
-					if(dto.getMessage() != null && dto.getMessage().getReport() != null)
-						cell.setCellValue(new Double(dto.getMessage().getReport().getMark()).doubleValue());
+					if(dto.getMessage() != null && dto.getMessage().getReport() != null 
+							&& dto.getMessage().getReport().getMark() != null)
+						cell.setCellValue(dto.getMessage().getReport().getMark().doubleValue());
 					else
 						cell.setCellValue("");
 					
@@ -302,8 +304,11 @@
 		
 		//echo back to web page
 		MarkForm markForm = (MarkForm) form;
-		if(msg.getReport() != null){
-			markForm.setMark(new Integer(msg.getReport().getMark()).toString());
+		if(msg.getReport() != null ){
+			if(msg.getReport().getMark() != null)
+				markForm.setMark(msg.getReport().getMark().toString());
+			else
+				markForm.setMark("");
 			markForm.setComment(msg.getReport().getComment());
 		}
 		markForm.setUser(user);
@@ -329,7 +334,7 @@
 			report = new ForumReport();
 			msg.setReport(report);
 		}
-		report.setMark(Integer.parseInt(markForm.getMark()));
+		report.setMark(new Float(Float.parseFloat(markForm.getMark())));
 		report.setComment(markForm.getComment());
 		forumService.updateTopic(msg);
 		
@@ -442,9 +447,52 @@
 
 	private ActionForward statistic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) {
+		Long sessionId = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_SESSION_ID));
+
+		forumService = getForumService();
+		List topicList = forumService.getRootTopics(sessionId);
+		Iterator iter = topicList.iterator();
+		int totalMsg = 0;
+		int msgNum;
+		float totalMsgMarkSum = 0;
+		float msgMarkSum = 0;
+		for(;iter.hasNext();){
+			MessageDTO msgDto = (MessageDTO) iter.next();
+			//get all message under this topic
+			List topicThread = forumService.getTopicThread(msgDto.getMessage().getUid());
+			//loop all message under this topic
+			msgMarkSum = 0;
+			Iterator threadIter = topicThread.iterator();
+			for(msgNum=0;threadIter.hasNext();msgNum++){
+				MessageDTO dto = (MessageDTO) threadIter.next();
+				if(dto.getMark() != null)
+					msgMarkSum += dto.getMark().floatValue();
+			}	
+			//summary to total mark
+			totalMsgMarkSum += msgMarkSum;
+			//set average mark to topic message DTO for display use
+			msgDto.setMark(getAverageFormat(msgMarkSum/(float)msgNum));
+			totalMsg += msgNum;
+		}
+		
+		float averMark = totalMsg == 0 ? 0: (totalMsgMarkSum/(float)totalMsg);
+		request.setAttribute("topicList",topicList);
+		request.setAttribute("markAverage",getAverageFormat(averMark));
+		request.setAttribute("totalMessage",new Integer(totalMsg));
 		return mapping.findForward("success");
 	}
 
+	private Float getAverageFormat(float aver) {
+		try {
+			NumberFormat format = NumberFormat.getInstance();
+			format.setMaximumFractionDigits(1);
+			return new Float(Float.parseFloat(format.format(aver)));
+		} catch (Exception e) {
+			return new Float(0);
+		}
+	}
+
+
 	private ActionForward viewTopic(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 			HttpServletResponse response) {
     	
@@ -484,9 +532,6 @@
 		while(iter.hasNext()){
 			MessageDTO dto = (MessageDTO) iter.next();
 			ForumReport report = dto.getMessage().getReport();
-			if(report != null){
-				log.info("REPROT MARK" + report.getMark());
-			}
 			List list = (List) topicsByUser.get(dto.getMessage().getCreatedBy());
 			if(list == null){
 				list = new ArrayList();
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/MarkForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/MarkForm.java,v
diff -u -r1.2 -r1.3
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/MarkForm.java	24 Nov 2005 03:40:59 -0000	1.2
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/MarkForm.java	30 Nov 2005 03:36:13 -0000	1.3
@@ -60,9 +60,9 @@
             	errors.add("report.mark", error);
             }else {
             	try{
-            		Integer.parseInt(mark);
+            		Float.parseFloat(mark);
             	}catch(Exception e){
-                  	ActionMessage error = new ActionMessage("error.mark.needInteger");
+                  	ActionMessage error = new ActionMessage("error.mark.invalid.number");
                 	errors.add("report.mark", error);
             	}
             }
Index: lams_tool_forum/web/WEB-INF/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/Attic/struts-config.xml,v
diff -u -r1.26 -r1.27
--- lams_tool_forum/web/WEB-INF/struts-config.xml	24 Nov 2005 06:25:24 -0000	1.26
+++ lams_tool_forum/web/WEB-INF/struts-config.xml	30 Nov 2005 03:36:14 -0000	1.27
@@ -330,7 +330,7 @@
 		<action path="/monitoring/statistic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
 			parameter="statistic" >
-			<forward name="success" path="tiles:/monitoring/forum/listContentUsers" />
+			<forward name="success" path="tiles:/monitoring/forum/statistic" />
 		</action>
 		<action path="/monitoring/viewTopic"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
Index: lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/struts/Attic/tiles-defs.xml,v
diff -u -r1.14 -r1.15
--- lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml	24 Nov 2005 06:25:24 -0000	1.14
+++ lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml	30 Nov 2005 03:36:13 -0000	1.15
@@ -103,6 +103,11 @@
     	<put name="body" value="/jsps/monitoring/instructions.jsp"/>
 	</definition>
 	
+	<definition name="tiles:/monitoring/forum/statistic" extends="tiles:layout">
+    	<put name="pageTitleKey" value="page.title.monitoring.statistic"/>
+    	<put name="body" value="/jsps/monitoring/statistic.jsp"/>
+	</definition>
+	
 	<definition name="tiles:/monitoring/forum/viewTopic" extends="tiles:layout">
     	<put name="pageTitleKey" value="page.title.monitoring.view.topic"/>
     	<put name="body" value="/jsps/monitoring/viewtopic.jsp"/>
Index: lams_tool_forum/web/jsps/monitoring/statistic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/statistic.jsp,v
diff -u -r1.1 -r1.2
--- lams_tool_forum/web/jsps/monitoring/statistic.jsp	22 Nov 2005 04:01:13 -0000	1.1
+++ lams_tool_forum/web/jsps/monitoring/statistic.jsp	30 Nov 2005 03:36:14 -0000	1.2
@@ -1,33 +1,48 @@
-<%@include file="../sharing/share.jsp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html:html locale="true">
-  <head>    
-    <title>Monitoring Statistic</title>
-    <html:base/>
-  	<link href="<%=LAMS_WEB_ROOT%>/css/aqua.css" rel="stylesheet" type="text/css">
-  </head>  
-  <body>
-		<h1><fmt:message key="monitoring.statistic.title"/></h1>
-		<div class="datatablecontainer">
-		<table width="100%"  border="0" cellspacing="0" cellpadding="0">
-		  <tr>
-		    <th scope="col">Title</th>
-		    <th scope="col">Count</th>
-		  </tr>
-		  <tr>
-		    <td><fmt:message key="monitoring.statistic.marked"/></td>
-		    <td><c:out value="${statistic.markedCount}"/></td>
-		  </tr>
-		  <tr>
-		    <td><fmt:message key="monitoring.statistic.not.marked"/></td>
-		    <td><c:out value="${statistic.notMarkedCount}"/></td>
-		  </tr>
-		  <tr>
-		    <td><fmt:message key="monitoring.statistic.total.uploaded.file"/></td>
-		    <td><c:out value="${statistic.totalUploadedFiles}"/></td>
-		  </tr>
+<%@ include file="/includes/taglibs.jsp" %>
+<script type="text/javascript" src="<html:rewrite page='/includes/scripts.jsp'/>"></script>
+
+<div class="datatablecontainer">
+<table width="100%"  border="0" cellspacing="0" cellpadding="0">
+
+  <tr>
+	  <td colspan="2">
+		<div id="datatablecontainer">
+		<table width="100%" align="CENTER" 	class="form">
+			<tr>
+				<th scope="col" width="50%"><fmt:message key="lable.topic.title.subject"/></th>
+				<th scope="col" width="25%"><fmt:message key="lable.topic.title.message.number"/></th>
+				<th scope="col" width="25%"><fmt:message key="lable.topic.title.average.mark"/></th>
+			</tr>
+			<c:forEach items="${topicList}" var="topic" >
+				<tr>
+					<td valign="MIDDLE" width="48%">
+						<c:set var="viewtopic">
+							<html:rewrite page="/monitoring/viewTopic.do?messageID=${topic.message.uid}&create=${topic.message.created.time}" />
+						</c:set> 
+						<html:link href="javascript:launchPopup('${viewtopic}');">
+							<c:out value="${topic.message.subject}" />
+						</html:link>
+					</td>
+					<td>
+						<c:out value="${topic.message.replyNumber+1}"/>
+					</td>
+					<td>
+						<c:out value="${topic.mark}"/>
+					</td>
+				</tr>
+			</c:forEach>
 		</table>
-		</div>						
-  </body>
-</html:html>
+		</div>  
+	  </td>
+  </tr>
 
+  <tr>
+    <td><br><fmt:message key="lable.monitoring.statistic.total.message"/></td>
+    <td><br><c:out value="${totalMessage}"/></td>
+  </tr>  
+  <tr>
+    <td><fmt:message key="label.monitoring.statistic.average.mark"/></td>
+    <td><c:out value="${markAverage}"/></td>
+  </tr>
+</table>
+</div>