Index: lams_tool_forum/conf/language/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/conf/language/Attic/ApplicationResources.properties,v
diff -u -r1.12 -r1.13
--- lams_tool_forum/conf/language/ApplicationResources.properties	3 Aug 2006 04:50:13 -0000	1.12
+++ lams_tool_forum/conf/language/ApplicationResources.properties	8 Aug 2006 01:56:34 -0000	1.13
@@ -143,4 +143,6 @@
 
 
 #======= End labels: Exported 134 labels for en AU =====
-button.close=Close
\ No newline at end of file
+button.close=Close
+button.release.mark=Release marks
+msg.mark.released=Marks in {0} have been released.
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.35 -r1.36
--- lams_tool_forum/conf/xdoclet/struts-actions.xml	4 Aug 2006 04:25:32 -0000	1.35
+++ lams_tool_forum/conf/xdoclet/struts-actions.xml	8 Aug 2006 01:56:34 -0000	1.36
@@ -239,6 +239,11 @@
 		    parameter="statistic" >
 			<forward name="success" path="/jsps/monitoring/statisticpart.jsp"/>	        
 		</action>
+		<action path="/monitoring/releaseMark" 
+			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
+		    scope="request"
+		    parameter="releaseMark" >
+		</action>
 	
 		<action path="/monitoring/downloadMarks"
 			type="org.lamsfoundation.lams.tool.forum.web.actions.MonitoringAction"
@@ -256,7 +261,7 @@
 			scope="request"
 			validate="false"
 			parameter="viewAllMarks" >
-			<forward name="success" path="tiles:/monitoring/forum/viewAllMarks" />
+			<forward name="success" path="tiles:/monitoring/forum/viewMark" />
 		</action>
 		
 		<!--  EDIT MARK		 -->
@@ -266,7 +271,7 @@
 			scope="request"
 			validate="false"
 			parameter="viewUserMark" >
-			<forward name="success" path="tiles:/monitoring/forum/viewUserMark" />
+			<forward name="success" path="tiles:/monitoring/forum/viewMark" />
 		</action>
 		
 		<action path="/monitoring/editMark"
@@ -285,7 +290,7 @@
 			scope="request"
 			validate="false"
 			parameter="updateMark" >
-			<forward name="success" path="tiles:/monitoring/forum/viewUserMark" />
+			<forward name="success" path="tiles:/monitoring/forum/viewMark" />
 		</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.21 -r1.22
--- lams_tool_forum/db/sql/create_lams_tool_forum.sql	21 Mar 2006 06:17:07 -0000	1.21
+++ lams_tool_forum/db/sql/create_lams_tool_forum.sql	8 Aug 2006 01:56:34 -0000	1.22
@@ -87,6 +87,7 @@
    session_end_date datetime,
    session_start_date datetime,
    status integer,
+   mark_released smallint,
    forum_uid bigint,
    session_id bigint,
    session_name varchar(250),
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.18 -r1.19
--- lams_tool_forum/db/sql/table-schema.sql	21 Mar 2006 06:17:07 -0000	1.18
+++ lams_tool_forum/db/sql/table-schema.sql	8 Aug 2006 01:56:34 -0000	1.19
@@ -1,15 +1,13 @@
--- $Id$
-
 alter table tl_lafrum11_attachment drop foreign key FK389AD9A2FE939F2A;
 alter table tl_lafrum11_attachment drop foreign key FK389AD9A2131CE31E;
 alter table tl_lafrum11_forum drop foreign key FK87917942E42F4351;
 alter table tl_lafrum11_forum_user drop foreign key FK7B83A4A85F0116B6;
-alter table tl_lafrum11_message drop foreign key FK4A6067E8E42F4351;
+alter table tl_lafrum11_message drop foreign key FK4A6067E89357B45B;
 alter table tl_lafrum11_message drop foreign key FK4A6067E897F0DB46;
+alter table tl_lafrum11_message drop foreign key FK4A6067E8E42F4351;
 alter table tl_lafrum11_message drop foreign key FK4A6067E8131CE31E;
-alter table tl_lafrum11_message drop foreign key FK4A6067E824089E4D;
-alter table tl_lafrum11_message drop foreign key FK4A6067E89357B45B;
 alter table tl_lafrum11_message drop foreign key FK4A6067E8647A7264;
+alter table tl_lafrum11_message drop foreign key FK4A6067E824089E4D;
 alter table tl_lafrum11_message_seq drop foreign key FKD2C71F88FE939F2A;
 alter table tl_lafrum11_message_seq drop foreign key FKD2C71F8845213B4D;
 alter table tl_lafrum11_tool_session drop foreign key FK5A04D7AE131CE31E;
@@ -20,100 +18,23 @@
 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,
-   file_type varchar(255),
-   file_name varchar(255),
-   file_uuid bigint,
-   create_date datetime,
-   forum_uid bigint,
-   message_uid bigint,
-   primary key (uid)
-);
-create table tl_lafrum11_forum (
-   uid bigint not null auto_increment,
-   create_date datetime,
-   update_date datetime,
-   create_by bigint,
-   title varchar(255),
-   allow_anonym bit,
-   run_offline bit,
-   lock_on_finished bit,
-   instructions text,
-   online_instructions text,
-   offline_instructions text,
-   content_in_use bit,
-   define_later bit,
-   content_id bigint unique,
-   allow_edit bit,
-   allow_rich_editor bit,
-   limited_of_chars integer,
-   limited_input_flag bit,
-   primary key (uid)
-);
-create table tl_lafrum11_forum_user (
-   uid bigint not null auto_increment,
-   user_id bigint,
-   last_name varchar(255),
-   first_name varchar(255),
-   session_id bigint,
-   login_name varchar(255),
-   primary key (uid)
-);
-create table tl_lafrum11_message (
-   uid bigint not null auto_increment,
-   create_date datetime,
-   last_reply_date datetime,
-   update_date datetime,
-   create_by bigint,
-   modified_by bigint,
-   subject varchar(255),
-   body text,
-   is_authored bit,
-   is_anonymous bit,
-   forum_session_uid bigint,
-   parent_uid bigint,
-   forum_uid bigint,
-   reply_number integer,
-   hide_flag bit,
-   report_id bigint,
-   primary key (uid)
-);
-create table tl_lafrum11_message_seq (
-   uid bigint not null auto_increment,
-   root_message_uid bigint,
-   message_uid bigint,
-   message_level smallint,
-   primary key (uid)
-);
-create table tl_lafrum11_report (
-   uid bigint not null auto_increment,
-   comment text,
-   release_date datetime,
-   mark float,
-   primary key (uid)
-);
-create table tl_lafrum11_tool_session (
-   uid bigint not null auto_increment,
-   session_end_date datetime,
-   session_start_date datetime,
-   status integer,
-   forum_uid bigint,
-   session_id bigint,
-   session_name varchar(250),
-   primary key (uid)
-);
+create table tl_lafrum11_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, forum_uid bigint, message_uid bigint, primary key (uid));
+create table tl_lafrum11_forum (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), allow_anonym bit, run_offline bit, lock_on_finished bit, instructions text, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, content_id bigint unique, allow_edit bit, allow_rich_editor bit, limited_of_chars integer, limited_input_flag bit, primary key (uid));
+create table tl_lafrum11_forum_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), first_name varchar(255), session_id bigint, login_name varchar(255), primary key (uid));
+create table tl_lafrum11_message (uid bigint not null auto_increment, create_date datetime, last_reply_date datetime, update_date datetime, create_by bigint, modified_by bigint, subject varchar(255), body text, is_authored bit, is_anonymous bit, forum_session_uid bigint, parent_uid bigint, forum_uid bigint, reply_number integer, hide_flag bit, report_id bigint, primary key (uid));
+create table tl_lafrum11_message_seq (uid bigint not null auto_increment, root_message_uid bigint, message_uid bigint, message_level smallint, primary key (uid));
+create table tl_lafrum11_report (uid bigint not null auto_increment, comment text, release_date datetime, mark float, primary key (uid));
+create table tl_lafrum11_tool_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, forum_uid bigint, session_id bigint, session_name varchar(250), mark_released bit, primary key (uid));
 alter table tl_lafrum11_attachment add index FK389AD9A2FE939F2A (message_uid), add constraint FK389AD9A2FE939F2A foreign key (message_uid) references tl_lafrum11_message (uid);
 alter table tl_lafrum11_attachment add index FK389AD9A2131CE31E (forum_uid), add constraint FK389AD9A2131CE31E foreign key (forum_uid) references tl_lafrum11_forum (uid);
 alter table tl_lafrum11_forum add index FK87917942E42F4351 (create_by), add constraint FK87917942E42F4351 foreign key (create_by) references tl_lafrum11_forum_user (uid);
 alter table tl_lafrum11_forum_user add index FK7B83A4A85F0116B6 (session_id), add constraint FK7B83A4A85F0116B6 foreign key (session_id) references tl_lafrum11_tool_session (uid);
-alter table tl_lafrum11_message add index FK4A6067E8E42F4351 (create_by), add constraint FK4A6067E8E42F4351 foreign key (create_by) references tl_lafrum11_forum_user (uid);
+alter table tl_lafrum11_message add index FK4A6067E89357B45B (forum_session_uid), add constraint FK4A6067E89357B45B foreign key (forum_session_uid) references tl_lafrum11_tool_session (uid);
 alter table tl_lafrum11_message add index FK4A6067E897F0DB46 (report_id), add constraint FK4A6067E897F0DB46 foreign key (report_id) references tl_lafrum11_report (uid);
+alter table tl_lafrum11_message add index FK4A6067E8E42F4351 (create_by), add constraint FK4A6067E8E42F4351 foreign key (create_by) references tl_lafrum11_forum_user (uid);
 alter table tl_lafrum11_message add index FK4A6067E8131CE31E (forum_uid), add constraint FK4A6067E8131CE31E foreign key (forum_uid) references tl_lafrum11_forum (uid);
-alter table tl_lafrum11_message add index FK4A6067E824089E4D (parent_uid), add constraint FK4A6067E824089E4D foreign key (parent_uid) references tl_lafrum11_message (uid);
-alter table tl_lafrum11_message add index FK4A6067E89357B45B (forum_session_uid), add constraint FK4A6067E89357B45B foreign key (forum_session_uid) references tl_lafrum11_tool_session (uid);
 alter table tl_lafrum11_message add index FK4A6067E8647A7264 (modified_by), add constraint FK4A6067E8647A7264 foreign key (modified_by) references tl_lafrum11_forum_user (uid);
+alter table tl_lafrum11_message add index FK4A6067E824089E4D (parent_uid), add constraint FK4A6067E824089E4D foreign key (parent_uid) references tl_lafrum11_message (uid);
 alter table tl_lafrum11_message_seq add index FKD2C71F88FE939F2A (message_uid), add constraint FKD2C71F88FE939F2A foreign key (message_uid) references tl_lafrum11_message (uid);
 alter table tl_lafrum11_message_seq add index FKD2C71F8845213B4D (root_message_uid), add constraint FKD2C71F8845213B4D foreign key (root_message_uid) references tl_lafrum11_message (uid);
 alter table tl_lafrum11_tool_session add index FK5A04D7AE131CE31E (forum_uid), add constraint FK5A04D7AE131CE31E foreign key (forum_uid) references tl_lafrum11_forum (uid);
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml,v
diff -u -r1.9 -r1.10
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml	5 Jul 2006 03:50:18 -0000	1.9
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml	8 Aug 2006 01:56:34 -0000	1.10
@@ -4,7 +4,7 @@
 	<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
 		<property name="basename"><value>org.lamsfoundation.lams.tool.forum.ApplicationResources</value></property>
 	</bean>
-	<bean id="messageService" class="org.lamsfoundation.lams.util.MessageService" singleton="true">
+	<bean id="forumMessageService" class="org.lamsfoundation.lams.util.MessageService" singleton="true">
 		<property name="messageSource"><ref local="messageSource"/></property>										
 	</bean>
     <!-- Hibernate SessionFactory -->
@@ -104,7 +104,7 @@
    			<ref bean="exportToolContentService"/>
    		</property>
    		<property name="auditService"><ref bean="auditService"/></property>
-   		<property name="messageService"><ref bean="messageService"/></property>
+   		<property name="messageService"><ref bean="forumMessageService"/></property>
     </bean>
 
     <bean id="forumService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
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.11 -r1.12
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/MessageDTO.java	3 Aug 2006 01:19:33 -0000	1.11
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/MessageDTO.java	8 Aug 2006 01:56:34 -0000	1.12
@@ -43,9 +43,8 @@
 	private boolean isAuthor;
 	private Float mark;
 	private String comment;
+	private boolean released;
 
-
-
 	/**
 	 * Get a <code>MessageDTO</code> instance from a given <code>Message</code>.
 	 * 
@@ -68,6 +67,7 @@
 		if(report != null && report.getMark() != null){
 			dto.mark = report.getMark();
 			dto.comment = report.getComment();
+			dto.released = report.getDateMarksReleased() == null?false:true;
 		}
 		
 		return dto;
@@ -98,6 +98,7 @@
 			if(report != null && report.getMark() != null){
 				msgDto.mark = report.getMark();
 				msgDto.comment = report.getComment();
+				msgDto.released = report.getDateMarksReleased() == null?false:true;
 			}
 
 			retSet.add(msgDto);
@@ -158,4 +159,13 @@
 	public void setComment(String comment) {
 		this.comment = comment;
 	}
+
+	public boolean isReleased() {
+		return released;
+	}
+
+	public void setReleased(boolean isReleased) {
+		this.released = isReleased;
+	}
+	
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/BaseDAOHibernate.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/BaseDAOHibernate.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/BaseDAOHibernate.java	8 Aug 2006 01:56:34 -0000	1.1
@@ -0,0 +1,71 @@
+/****************************************************************
+ * 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 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
+ * ****************************************************************
+ */
+/* $$Id: BaseDAOHibernate.java,v 1.1 2006/08/08 01:56:34 steven Exp $$ */
+package org.lamsfoundation.lams.tool.forum.persistence;
+
+import java.io.Serializable;
+import java.util.List;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
+
+/**
+ * This class serves as the Base class for all other DAOs - namely to hold
+ * common methods that they might all use. Can be used for standard CRUD
+ * operations.</p>
+ *
+ * @author Dapeng.Ni
+ */
+public class BaseDAOHibernate extends HibernateDaoSupport {
+    protected final Log log = LogFactory.getLog(getClass());
+
+    /**
+     * @see com.edgenius.paradise.dao.DAO#saveObject(java.lang.Object)
+     */
+    public void saveObject(Object o) {
+        getHibernateTemplate().saveOrUpdate(o);
+    }
+
+    /**
+     * @see com.edgenius.paradise.dao.DAO#getObject(java.lang.Class, java.io.Serializable)
+     */
+    public Object getObject(Class clazz, Serializable id) {
+        Object o = getHibernateTemplate().get(clazz, id);
+        return o;
+    }
+
+    /**
+     * @see com.edgenius.paradise.dao.DAO#getObjects(java.lang.Class)
+     */
+    public List getObjects(Class clazz) {
+        return getHibernateTemplate().loadAll(clazz);
+    }
+
+    /**
+     * @see com.edgenius.paradise.dao.DAO#removeObject(java.lang.Class, java.io.Serializable)
+     */
+    public void removeObject(Class clazz, Serializable id) {
+        getHibernateTemplate().delete(getObject(clazz, id));
+    }
+}
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumReportDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Attic/ForumReportDAO.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumReportDAO.java	8 Aug 2006 01:56:34 -0000	1.1
@@ -0,0 +1,6 @@
+package org.lamsfoundation.lams.tool.forum.persistence;
+
+
+public class ForumReportDAO extends BaseDAOHibernate {
+
+}
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.java,v
diff -u -r1.5 -r1.6
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.java	6 Apr 2006 06:40:39 -0000	1.5
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.java	8 Aug 2006 01:56:34 -0000	1.6
@@ -45,6 +45,7 @@
 	private Forum forum;
 	private Date sessionStartDate;
 	private Date sessionEndDate;
+	private boolean markReleased;
 	//finish or not
 	private int status;
 	
@@ -149,5 +150,15 @@
 		this.sessionName = sessionName;
 	}
 
+	/**
+	 * @hibernate.property column="mark_released" 
+	 * @return Returns the mark released flag
+	 */
+	public boolean isMarkReleased() {
+		return markReleased;
+	}
+	public void setMarkReleased(boolean markReleased) {
+		this.markReleased = markReleased;
+	}
 
 }
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.59 -r1.60
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	4 Aug 2006 07:22:43 -0000	1.59
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java	8 Aug 2006 01:56:34 -0000	1.60
@@ -68,6 +68,7 @@
 import org.lamsfoundation.lams.tool.forum.persistence.ForumDao;
 import org.lamsfoundation.lams.tool.forum.persistence.ForumException;
 import org.lamsfoundation.lams.tool.forum.persistence.ForumReport;
+import org.lamsfoundation.lams.tool.forum.persistence.ForumReportDAO;
 import org.lamsfoundation.lams.tool.forum.persistence.ForumToolSession;
 import org.lamsfoundation.lams.tool.forum.persistence.ForumToolSessionDao;
 import org.lamsfoundation.lams.tool.forum.persistence.ForumUser;
@@ -103,6 +104,7 @@
 	private MessageSeqDao messageSeqDao;
 	private ForumUserDao forumUserDao;
 	private ForumToolSessionDao forumToolSessionDao;
+	private ForumReportDAO forumReportDAO;
 	//system level handler and service 
 	private ILamsToolService toolService;
 	private ForumToolContentHandler forumToolContentHandler;
@@ -193,7 +195,10 @@
         
         return message;
     }
-     
+
+ 	public void updateReport(ForumReport report) {
+ 		forumReportDAO.saveObject(report);
+ 	}
     public Message updateMessageHideFlag(Long messageId, boolean hideFlag) {
     	
     	Message message = getMessage(messageId);
@@ -424,6 +429,7 @@
 	}
 
 	public void releaseMarksForSession(Long sessionID) {
+		//udate release mark date for each message.
 		List list = messageDao.getBySession(sessionID);
 		Iterator iter = list.iterator();
 		while(iter.hasNext()){
@@ -433,6 +439,11 @@
 				report.setDateMarksReleased(new Date());
 			messageDao.saveOrUpdate(msg);
 		}
+		//update session to set MarkRelease flag.
+		ForumToolSession session = forumToolSessionDao.getBySessionId(sessionID);
+		session.setMarkReleased(true);
+		forumToolSessionDao.saveOrUpdate(session);
+		
 	}
 
     //***************************************************************************************************************
@@ -884,7 +895,12 @@
 		this.userManagementService = userManagementService;
 	}
 
+	public ForumReportDAO getForumReportDAO() {
+		return forumReportDAO;
+	}
 
+	public void setForumReportDAO(ForumReportDAO forumReportDAO) {
+		this.forumReportDAO = forumReportDAO;
+	}
 
-
 }
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java,v
diff -u -r1.29 -r1.30
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java	14 Jun 2006 06:02:58 -0000	1.29
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java	8 Aug 2006 01:56:34 -0000	1.30
@@ -30,6 +30,7 @@
 import org.lamsfoundation.lams.tool.forum.dto.MessageDTO;
 import org.lamsfoundation.lams.tool.forum.persistence.Attachment;
 import org.lamsfoundation.lams.tool.forum.persistence.Forum;
+import org.lamsfoundation.lams.tool.forum.persistence.ForumReport;
 import org.lamsfoundation.lams.tool.forum.persistence.ForumToolSession;
 import org.lamsfoundation.lams.tool.forum.persistence.ForumUser;
 import org.lamsfoundation.lams.tool.forum.persistence.Message;
@@ -259,7 +260,11 @@
 	 * @return
 	 */
 	public ForumUser getUserByID(Long userId);
-	
+	/**
+	 * Update forum message report.
+	 * @param report
+	 */
+	public void updateReport(ForumReport report);
 	//************************************************************************************
 	// Report  Method
 	//************************************************************************************
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java,v
diff -u -r1.31 -r1.32
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	3 Aug 2006 04:50:13 -0000	1.31
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java	8 Aug 2006 01:56:34 -0000	1.32
@@ -87,7 +87,9 @@
 	public static final String ATTR_TOOL_CONTENT_TOPICS = "ToolContentTopicList";
 	public static final String ATTR_TOPIC = "topic";
 	public static final String ATTR_USER= "user";
-	public static final String ATTR_TOPIC_LIST = "topicList";
+	public static final String ATTR_REPORT = "report";
 	
+	public static final String PARAM_UPDATE_MODE = "updateMode";
 	
+	
 }
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.21 -r1.22
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java	4 Aug 2006 04:25:32 -0000	1.21
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java	8 Aug 2006 01:56:34 -0000	1.22
@@ -27,10 +27,12 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.PrintWriter;
 import java.text.DateFormat;
 import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Comparator;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -67,6 +69,7 @@
 import org.lamsfoundation.lams.tool.forum.util.ForumWebUtils;
 import org.lamsfoundation.lams.tool.forum.web.forms.ForumForm;
 import org.lamsfoundation.lams.tool.forum.web.forms.MarkForm;
+import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.springframework.web.context.WebApplicationContext;
@@ -90,6 +93,20 @@
 				return -1;
 		}
 	}
+	
+	private class ForumUserComparator implements Comparator<ForumUser>{
+		public int compare(ForumUser o1, ForumUser o2) {
+			if(o1 != null && o2 != null){
+				int c = o1.getLoginName().compareTo(o2.getLoginName());
+				//to ensure ForumUser can be put into map even they have duplicated name.
+				return c==0?1:c;
+			}else if(o1 != null)
+				return 1;
+			else
+				return -1;
+		}
+	}
+	
 	public final ActionForward execute(ActionMapping mapping, ActionForm form,
 			HttpServletRequest request, HttpServletResponse response)
 			throws Exception {
@@ -118,7 +135,9 @@
 		if (param.equals("updateMark")) {
 			return updateMark(mapping, form, request, response);
 		}
-
+		
+		if(param.equals("releaseMark"))
+			return releaseMark(mapping, form, request, response); 
 		// ***************** Miscellaneous ********************
 		if (param.equals("viewTopic")) {
 			return viewTopic(mapping, form, request, response);
@@ -190,8 +209,8 @@
 
 		Map topicsByUser = getTopicsSortedByAuthor(topicList);
 		request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, sessionID);
-		request.setAttribute("report", topicsByUser);
-
+		request.setAttribute(ForumConstants.ATTR_REPORT, topicsByUser);
+		request.setAttribute(ForumConstants.PARAM_UPDATE_MODE, "listAllMarks");
 		return mapping.findForward("success");
 	}
 
@@ -337,14 +356,16 @@
 				AttributeNames.PARAM_TOOL_SESSION_ID));
 
 		forumService = getForumService();
-		List messageList = forumService
-				.getMessagesByUserUid(userUid, sessionId);
+		List<MessageDTO> messageList = forumService.getMessagesByUserUid(userUid, sessionId);
 		ForumUser user = forumService.getUser(userUid);
 
 		// each back to web page
-		request.setAttribute(ForumConstants.ATTR_TOPIC_LIST, messageList);
-		request.setAttribute(ForumConstants.ATTR_USER, user);
+		Map<ForumUser,List<MessageDTO>> report = new TreeMap(this.new ForumUserComparator());
+		report.put(user,messageList);
+		request.setAttribute(ForumConstants.ATTR_REPORT, report);
+		
 		request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, sessionId);
+		request.setAttribute(ForumConstants.PARAM_UPDATE_MODE, "listMarks");
 		return mapping.findForward("success");
 	}
 
@@ -365,7 +386,8 @@
 				ForumConstants.MESSAGE_UID));
 		Long sessionId = new Long(WebUtil.readLongParam(request,
 				AttributeNames.PARAM_TOOL_SESSION_ID));
-
+		String updateMode = request.getParameter(ForumConstants.PARAM_UPDATE_MODE);
+		
 		// get Message and User from database
 		forumService = getForumService();
 		Message msg = forumService.getMessage(messageId);
@@ -385,6 +407,7 @@
 		request.setAttribute(ForumConstants.ATTR_TOPIC, MessageDTO.getMessageDTO(msg));
 		request.setAttribute(ForumConstants.ATTR_USER, user);
 		request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, sessionId);
+		request.setAttribute(ForumConstants.PARAM_UPDATE_MODE, updateMode);
 		
 		return mapping.findForward("success");
 	}
@@ -407,7 +430,9 @@
 				ForumConstants.USER_UID));
 		Long sessionId = new Long(WebUtil.readLongParam(request,
 				AttributeNames.PARAM_TOOL_SESSION_ID));
-
+		String updateMode = request.getParameter(ForumConstants.PARAM_UPDATE_MODE);
+		request.setAttribute(ForumConstants.PARAM_UPDATE_MODE, updateMode);
+		
 		String mark = markForm.getMark();
         ActionErrors errors = new ActionErrors();
         if (StringUtils.isBlank(mark)) {
@@ -427,7 +452,6 @@
         
 		forumService = getForumService();
 		// echo back to web page
-		List messageList = forumService.getMessagesByUserUid(userUid, sessionId);
 		ForumUser user = forumService.getUser(userUid);
 		Message msg = forumService.getMessage(messageId);
 		
@@ -448,13 +472,28 @@
 			report = new ForumReport();
 			msg.setReport(report);
 		}
+		//only session has been released mark, the data of mark release will have value.
+		ForumToolSession toolSession = forumService.getSessionBySessionId(sessionId);
+		if(toolSession.isMarkReleased())
+			report.setDateMarksReleased(new Date());
+		
 		report.setMark(new Float(Float.parseFloat(mark)));
 		report.setComment(markForm.getComment());
-		
-		//echo back to topic list page
-		request.setAttribute(ForumConstants.ATTR_TOPIC_LIST, messageList);
 		forumService.updateTopic(msg);
+		
+		//echo back to topic list page: it depends which screen is come from: view special user mark, or view all user marks. 
+		if(StringUtils.equals(updateMode, "listAllMarks")){
+			List topicList = forumService.getAllTopicsFromSession(sessionId);
+			Map topicsByUser = getTopicsSortedByAuthor(topicList);
+			request.setAttribute(ForumConstants.ATTR_REPORT, topicsByUser);
+		}else{
+			List<MessageDTO> messageList = forumService.getMessagesByUserUid(userUid, sessionId);
+			Map<ForumUser,List<MessageDTO>> topicMap = new TreeMap(this.new ForumUserComparator());
+			topicMap.put(user,messageList);
+			request.setAttribute(ForumConstants.ATTR_REPORT, topicMap);
+		}
 
+		//listMark or listAllMark.
 		return mapping.findForward("success");
 
 	}
@@ -616,6 +655,28 @@
 		return mapping.findForward("success");
 	}
 
+
+
+	private ActionForward releaseMark(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) {
+		//get service then update report table
+		forumService = getForumService();
+		Long sessionID =new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_SESSION_ID));
+		forumService.releaseMarksForSession(sessionID);
+		try {
+			PrintWriter out = response.getWriter();
+			ForumToolSession session = forumService.getSessionBySessionId(sessionID);
+			String sessionName = "";
+			if(session != null)
+				sessionName = session.getSessionName();
+			out.write(getMessageService().getMessage("msg.mark.released",new String[]{sessionName}));
+			out.flush();
+		} catch (IOException e) {
+		}
+		
+		return null;
+	}
+
+
 	// ==========================================================================================
 	// Utility methods
 	// ==========================================================================================
@@ -673,15 +734,15 @@
 	 * @return
 	 */
 	private Map getTopicsSortedByAuthor(List topicList) {
-		Map topicsByUser = new HashMap();
+		Map<ForumUser,List<MessageDTO>> topicsByUser = new TreeMap(this.new ForumUserComparator());
 		Iterator iter = topicList.iterator();
 		while (iter.hasNext()) {
 			MessageDTO dto = (MessageDTO) iter.next();
 			dto.getMessage().getReport();
-			List list = (List) topicsByUser
+			List<MessageDTO> list = (List) topicsByUser
 					.get(dto.getMessage().getCreatedBy());
 			if (list == null) {
-				list = new ArrayList();
+				list = new ArrayList<MessageDTO>();
 				topicsByUser.put(dto.getMessage().getCreatedBy(), list);
 			}
 			list.add(dto);
@@ -704,5 +765,11 @@
 			return new Float(0);
 		}
 	}
-
+	/**
+	 * Return ResourceService bean.
+	 */
+	private MessageService getMessageService() {
+	      WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet().getServletContext());
+	      return (MessageService) wac.getBean("forumMessageService");
+	}
 }
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.29 -r1.30
--- lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml	3 Jul 2006 07:03:10 -0000	1.29
+++ lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml	8 Aug 2006 01:56:34 -0000	1.30
@@ -109,14 +109,10 @@
     	<put name="body" value="/jsps/authoring/definelaterforbid.jsp"/>
 	</definition>
 	
-	<definition name="tiles:/monitoring/forum/viewAllMarks" extends="tiles:layout">
+	<definition name="tiles:/monitoring/forum/viewMark" extends="tiles:layout">
     	<put name="pageTitleKey" value="page.title.monitoring.view.user.mark"/>
-    	<put name="body" value="/jsps/monitoring/viewallmarks.jsp"/>
+    	<put name="body" value="/jsps/monitoring/viewmarks.jsp"/>
 	</definition>
-	<definition name="tiles:/monitoring/forum/viewUserMark" extends="tiles:layout">
-    	<put name="pageTitleKey" value="page.title.monitoring.view.user.mark"/>
-    	<put name="body" value="/jsps/monitoring/usermarklist.jsp"/>
-	</definition>
 	<definition name="tiles:/monitoring/forum/editUserMark" extends="tiles:layout">
     	<put name="pageTitleKey" value="page.title.monitoring.edit.user.mark"/>
     	<put name="body" value="/jsps/monitoring/updatemarks.jsp"/>
Index: lams_tool_forum/web/images/indicator.gif
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/images/indicator.gif,v
diff -u
Binary files differ
Index: lams_tool_forum/web/jsps/export/exportportfolio.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/export/exportportfolio.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_forum/web/jsps/export/exportportfolio.jsp	3 Aug 2006 01:19:33 -0000	1.7
+++ lams_tool_forum/web/jsps/export/exportportfolio.jsp	8 Aug 2006 01:56:34 -0000	1.8
@@ -75,7 +75,7 @@
 					</tr>
 				</c:if>
 				<%-- display mark for teacher --%>
-				<c:if test='${mode == "teacher"}'>
+				<c:if test="${msgDto.released || mode=='teacher'}">
 					<tr>
 						<td>
 							<span class="field-name" ><fmt:message key="lable.topic.title.mark"/></span>
Index: lams_tool_forum/web/jsps/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/summary.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_forum/web/jsps/monitoring/summary.jsp	3 Jul 2006 07:10:26 -0000	1.3
+++ lams_tool_forum/web/jsps/monitoring/summary.jsp	8 Aug 2006 01:56:34 -0000	1.4
@@ -1,13 +1,60 @@
 <%@ include file="/includes/taglibs.jsp"%>
-<html:errors />
+<c:set var="tool">
+	<lams:WebAppURL />
+</c:set>
+<script type="text/javascript">
+<!--
 
+	var messageTargetDiv = "messageArea";
+	function releaseMarks(sessionId){
+		var url = "<c:url value="/monitoring/releaseMark.do"/>";
+	    var reqIDVar = new Date();
+		var param = "toolSessionID=" + sessionId +"&reqID="+reqIDVar.getTime();
+		messageLoading();
+	    var myAjax = new Ajax.Updater(
+		    	messageTargetDiv,
+		    	url,
+		    	{
+		    		method:'get',
+		    		parameters:param,
+		    		onComplete:messageComplete,
+		    		evalScripts:true
+		    	}
+	    );
+		
+	}
+	
+	function showBusy(targetDiv){
+		if($(targetDiv+"_Busy") != null){
+			Element.show(targetDiv+"_Busy");
+		}
+	}
+	function hideBusy(targetDiv){
+		if($(targetDiv+"_Busy") != null){
+			Element.hide(targetDiv+"_Busy");
+		}				
+	}
+	function messageLoading(){
+		showBusy(messageTargetDiv);
+	}
+	function messageComplete(){
+		hideBusy(messageTargetDiv);
+	}
+	
+	
+//-->
+</script>
 
 <c:forEach var="element" items="${sessionUserMap}">
 	<c:set var="toolSessionDto" value="${element.key}" />
 	<c:set var="userlist" value="${element.value}" />
 	<c:set var="toolAccessMode" value="${mode}" />
 
 	<table cellpadding="0">
+		<tr><td colspan="3">
+			<img src="${tool}/images/indicator.gif" style="display:none" id="messageArea_Busy" />
+			<span id="messageArea"></span>
+		</td></tr>	
 		<tr>
 			<th colspan="3">
 				<fmt:message key="message.session.name" />
@@ -64,6 +111,11 @@
 				</html:form>
 			</td>
 			<td align="left">
+				<html:button property="releaseMarks" onclick="releaseMarks(${toolSessionDto.sessionID})" styleClass="button">
+					<fmt:message key="button.release.mark" />
+				</html:button>
+			</td>
+			<td align="left">
 				<html:form action="/monitoring/downloadMarks">
 					<html:hidden property="toolSessionID" value="${toolSessionDto.sessionID}" />
 					<html:submit property="downloadMarks" styleClass="button">
Index: lams_tool_forum/web/jsps/monitoring/updatemarks.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/updatemarks.jsp,v
diff -u -r1.11 -r1.12
--- lams_tool_forum/web/jsps/monitoring/updatemarks.jsp	3 Aug 2006 04:50:12 -0000	1.11
+++ lams_tool_forum/web/jsps/monitoring/updatemarks.jsp	8 Aug 2006 01:56:34 -0000	1.12
@@ -1,6 +1,10 @@
 <%@ include file="/includes/taglibs.jsp"%>
 
 <html:form action="/monitoring/updateMark" method="post">
+		<input type="hidden" name="toolSessionID" value="<c:out value='${toolSessionID}'/>" />
+		<input type="hidden" name="messageID" value="<c:out value='${topic.message.uid}'/>" />
+		<input type="hidden" name="userID" value="<c:out value='${user.uid}'/>" />
+		<input type="hidden" name="updateMode" value="${updateMode}" />
 
 	<table cellpadding="0">
 		<tr>
@@ -40,9 +44,6 @@
 		</tr>
 	</table>
 	<table>
-		<input type="hidden" name="toolSessionID" value="<c:out value='${toolSessionID}'/>" />
-		<input type="hidden" name="messageID" value="<c:out value='${topic.message.uid}'/>" />
-		<input type="hidden" name="userID" value="<c:out value='${user.uid}'/>" />
 		<tr>
 			<td colspan="2">
 				<%@ include file="/common/messages.jsp"%>
Fisheye: Tag 1.10 refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/monitoring/usermarklist.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.8 refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/monitoring/viewallmarks.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_forum/web/jsps/monitoring/viewmarks.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/viewmarks.jsp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_tool_forum/web/jsps/monitoring/viewmarks.jsp	8 Aug 2006 01:56:34 -0000	1.1
@@ -0,0 +1,112 @@
+<%@ include file="/common/taglibs.jsp"%>
+<table cellpadding="0">
+<c:if test="${empty report}">
+	<tr>
+		<td>
+			<div align="center">
+				<b><fmt:message key="message.not.avaliable" /></b>
+			</div>
+		</td>
+	</tr>
+</c:if>
+<c:forEach items="${report}" var="userList">
+	<c:set var="user" value="${userList.key}" />
+	<c:set var="topicList" value="${userList.value}" />
+		<c:if test="${empty topicList}">
+			<tr>
+				<td>
+					<div align="center">
+						<b><fmt:message key="message.not.avaliable" /></b>
+					</div>
+				</td>
+			</tr>
+		</c:if>
+	
+	
+		<c:forEach items="${topicList}" var="topic" varStatus="status">
+			<tr>
+				<td colspan="5">
+					<c:out value="${user.loginName}" />
+					,
+					<c:out value="${user.firstName}" />
+					<c:out value="${user.lastName}" />
+					<fmt:message key="monitoring.user.post.topic" />
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<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}','viewtopic');">
+						<c:out value="${topic.message.subject}" />
+					</html:link>
+				</td>
+				<td>
+					<c:if test="${topic.hasAttachment}">
+						<img src="<html:rewrite page="/images/paperclip.gif"/>">
+					</c:if>
+				</td>
+				<td>
+					<c:out value="${topic.author}" />
+				</td>
+				<td>
+					<c:out value="${topic.message.replyNumber}" />
+				</td>
+				<td>
+					<fmt:formatDate value="${topic.message.updated}" type="time" timeStyle="short" />
+					<fmt:formatDate value="${topic.message.updated}" type="date" dateStyle="full" />
+				</td>
+			</tr>
+	
+			<tr>
+				<td class="field-name" width="30%">
+					<fmt:message key="lable.topic.title.mark" />
+					:
+				</td>
+				<td colspan="4">
+					<c:choose>
+						<c:when test="${empty topic.message.report.mark}">
+							<fmt:message key="message.not.avaliable" />
+						</c:when>
+						<c:otherwise>
+							<c:out value="${topic.message.report.mark}" escapeXml="false" />
+						</c:otherwise>
+					</c:choose>
+				</td>
+			</tr>
+			<tr>
+				<td class="field-name" width="30%">
+					<fmt:message key="lable.topic.title.comment" />
+					:
+				</td>
+				<td colspan="4">
+					<c:choose>
+						<c:when test="${empty topic.message.report.comment}">
+							<fmt:message key="message.not.avaliable" />
+						</c:when>
+						<c:otherwise>
+							<c:out value="${topic.message.report.comment}" escapeXml="false" />
+						</c:otherwise>
+					</c:choose>
+				</td>
+			</tr>
+			<tr>
+				<td colspan="5">
+					<html:form action="/monitoring/editMark" method="post">
+						<input type="hidden" name="messageID" value=<c:out value='${topic.message.uid}' />>
+						<input type="hidden" name="toolSessionID" value=<c:out value='${toolSessionID}' />>
+						<input type="hidden" name="userID" value=<c:out value='${user.uid}' />>
+						<input type="hidden" name="updateMode" value="${updateMode}" />
+						<input type="submit" value="<fmt:message key="lable.update.mark"/>" class="button" />
+					</html:form>
+				</td>
+			</tr>
+		</c:forEach>
+		<tr>
+			<td>
+				<a href="javascript:window.close();" class="button"><fmt:message key="button.close"/></a>
+			</td>
+		</tr>
+</c:forEach>
+</table>