Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.hbm.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Attic/ForumToolSession.hbm.xml,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.hbm.xml 9 Nov 2005 05:28:26 -0000 1.1 @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Attic/Message.hbm.xml,v diff -u -r1.9 -r1.10 --- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml 8 Nov 2005 23:12:24 -0000 1.9 +++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml 9 Nov 2005 05:28:26 -0000 1.10 @@ -34,6 +34,14 @@ /> + + - - + parameter="viewTopic" scope="request"> + - + name="messageForm" validate="true" + parameter="createTopic" + scope="request"> + + + - + name="messageForm" validate="true" + parameter="replyTopic" + scope="request"> + + + + + + + + + - + Index: lams_tool_forum/src/java/forumApplicationContext.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/Attic/forumApplicationContext.xml,v diff -u -r1.14 -r1.15 --- lams_tool_forum/src/java/forumApplicationContext.xml 8 Nov 2005 23:12:24 -0000 1.14 +++ lams_tool_forum/src/java/forumApplicationContext.xml 9 Nov 2005 05:28:26 -0000 1.15 @@ -14,7 +14,7 @@ org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml org/lamsfoundation/lams/tool/forum/persistence/Attachment.hbm.xml org/lamsfoundation/lams/tool/forum/persistence/ForumUser.hbm.xml - org/lamsfoundation/lams/tool/forum/persistence/ToolSession.hbm.xml + org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.hbm.xml org/lamsfoundation/lams/tool/forum/persistence/MessageSeq.hbm.xml 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.2 -r1.3 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/MessageDTO.java 8 Nov 2005 06:15:02 -0000 1.2 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/MessageDTO.java 9 Nov 2005 05:28:27 -0000 1.3 @@ -34,6 +34,8 @@ private Message message; private String author; private boolean hasAttachment; + private short level; + public static MessageDTO getMessageDTO(Message msg, String authorName){ if(msg == null) return null; @@ -47,6 +49,19 @@ dto.setHasAttachment(true); return dto; } + public static MessageDTO getMessageDTO(Message msg){ + if(msg == null) + return null; + + MessageDTO dto = new MessageDTO(); + dto.setMessage(msg); + dto.setAuthor(msg.getCreatedBy().getFirstName()+" "+msg.getCreatedBy().getLastName()); + if(msg.getAttachments() == null || msg.getAttachments().isEmpty()) + dto.setHasAttachment(false); + else + dto.setHasAttachment(true); + return dto; + } public static Set getMessageDTO(Set msgSet,String authorName){ Set retSet = new HashSet(); if(msgSet == null || msgSet.isEmpty()) @@ -104,5 +119,11 @@ public void setMessage(Message message) { this.message = message; } + public short getLevel() { + return level; + } + public void setLevel(short level) { + this.level = level; + } } Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.hbm.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Attic/ForumToolSession.hbm.xml,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.hbm.xml 9 Nov 2005 05:28:26 -0000 1.1 @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.java 9 Nov 2005 05:28:26 -0000 1.1 @@ -0,0 +1,106 @@ +/* + *Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * + *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; either version 2 of the License, or + *(at your option) any later version. + * + *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 + */ +package org.lamsfoundation.lams.tool.forum.persistence; + +import java.util.Date; + +/** + * @hibernate.class table="tl_lafrum11_tool_session" + * @author Steve.Ni + * + * @version $Revision: 1.1 $ + */ +public class ForumToolSession { + private Long uid; + private Long sessionId; + private Forum forum; + private Date sessionStartDate; + private Date sessionEndDate; + //finish or not + private int status; + + /** + * @hibernate.id generator-class="identity" type="java.lang.Long" column="uid" + * @return Returns the learnerID. + */ + public Long getUid() { + return uid; + } + public void setUid(Long uuid) { + this.uid = uuid; + } + + /** + * @hibernate.property column="session_end_date" + * @return + */ + public Date getSessionEndDate() { + return sessionEndDate; + } + public void setSessionEndDate(Date sessionEndDate) { + this.sessionEndDate = sessionEndDate; + } + /** + * @hibernate.property column="session_start_date" + * + * @return + */ + public Date getSessionStartDate() { + return sessionStartDate; + } + public void setSessionStartDate(Date sessionStartDate) { + this.sessionStartDate = sessionStartDate; + } + /** + * @hibernate.property + * @return + */ + public int getStatus() { + return status; + } + public void setStatus(int status) { + this.status = status; + } + + /** + * @hibernate.many-to-one column="forum_uid" + * cascade="none" + * @return + */ + public Forum getForum() { + return forum; + } + public void setForum(Forum forum) { + this.forum = forum; + } + /** + * @hibernate.property column="session_id" + * @return + */ + public Long getSessionId() { + return sessionId; + } + public void setSessionId(Long sessionId) { + this.sessionId = sessionId; + } + + +} Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSessionDao.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSessionDao.java,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumToolSessionDao.java 9 Nov 2005 05:28:26 -0000 1.1 @@ -0,0 +1,38 @@ +/* + *Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * + *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; either version 2 of the License, or + *(at your option) any later version. + * + *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 + */ +package org.lamsfoundation.lams.tool.forum.persistence; + +import java.util.List; + +import org.springframework.orm.hibernate3.support.HibernateDaoSupport; + +public class ForumToolSessionDao extends HibernateDaoSupport { + + private static final String SQL_QUERY_FIND_BY_SESSION_ID = "from " + ForumToolSession.class.getName() + " where session_id=?"; + + public ForumToolSession getBySessionId(Long sessionId) { + List list = this.getHibernateTemplate().find(SQL_QUERY_FIND_BY_SESSION_ID,sessionId); + if(list == null || list.isEmpty()) + return null; + return (ForumToolSession) list.get(0); + } + +} Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Attic/Message.hbm.xml,v diff -u -r1.9 -r1.10 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml 8 Nov 2005 23:12:24 -0000 1.9 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml 9 Nov 2005 05:28:26 -0000 1.10 @@ -34,6 +34,14 @@ /> + + - - + parameter="viewTopic" scope="request"> + - + name="messageForm" validate="true" + parameter="createTopic" + scope="request"> + + + - + name="messageForm" validate="true" + parameter="replyTopic" + scope="request"> + + + + + + - + - - - + + + Index: lams_tool_forum/web/jsps/learning/create.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/create.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_forum/web/jsps/learning/create.jsp 8 Nov 2005 06:15:01 -0000 1.1 +++ lams_tool_forum/web/jsps/learning/create.jsp 9 Nov 2005 05:28:26 -0000 1.2 @@ -5,7 +5,7 @@
-<%@ include file="/jsps/message/topicform.jsp" %> +<%@ include file="/jsps/learning/message/topicform.jsp" %>
Index: lams_tool_forum/web/jsps/learning/reply.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/reply.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_forum/web/jsps/learning/reply.jsp 8 Nov 2005 06:15:01 -0000 1.1 +++ lams_tool_forum/web/jsps/learning/reply.jsp 9 Nov 2005 05:28:26 -0000 1.2 @@ -5,7 +5,7 @@
-<%@ include file="/jsps/message/topicreplyform.jsp" %> +<%@ include file="/jsps/learning/message/topicreplyform.jsp" %>
Index: lams_tool_forum/web/jsps/learning/viewforum.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/viewforum.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_forum/web/jsps/learning/viewforum.jsp 8 Nov 2005 06:15:01 -0000 1.1 +++ lams_tool_forum/web/jsps/learning/viewforum.jsp 9 Nov 2005 05:28:26 -0000 1.2 @@ -2,8 +2,22 @@
- - <%@ include file="/jsps/message/topiclist.jsp" %> + <%@ include file="/jsps/learning/message/topiclist.jsp" %>
+
+ + + + + + + + + + + + + + + + \ No newline at end of file Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_forum/web/jsps/learning/viewthread.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_forum/web/jsps/learning/viewtopic.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/viewtopic.jsp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_forum/web/jsps/learning/viewtopic.jsp 9 Nov 2005 05:28:26 -0000 1.1 @@ -0,0 +1,6 @@ +<%@ include file="/includes/taglibs.jsp" %> + + +
+ <%@ include file="/jsps/learning/message/topicview.jsp" %> +
Index: lams_tool_forum/web/jsps/learning/message/topiceditform.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/message/topiceditform.jsp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_forum/web/jsps/learning/message/topiceditform.jsp 9 Nov 2005 05:28:27 -0000 1.1 @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + +
* +
* +
+ +   + + + + + + + + + + + +   + + + + + + + + +
   + + + + +
Index: lams_tool_forum/web/jsps/learning/message/topicform.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/message/topicform.jsp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_forum/web/jsps/learning/message/topicform.jsp 9 Nov 2005 05:28:27 -0000 1.1 @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + +
* +
* +
+    +
   + + + +
Index: lams_tool_forum/web/jsps/learning/message/topiclist.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/message/topiclist.jsp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_forum/web/jsps/learning/message/topiclist.jsp 9 Nov 2005 05:28:27 -0000 1.1 @@ -0,0 +1,41 @@ +
+
+
+ + + + + + + + + + + + + + + + + +
Topic +
+ + + + + + + + + "> + + + + + + +
+
+
+
Index: lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp 9 Nov 2005 05:28:27 -0000 1.1 @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + +
* +
* +
+    +
   + + + +
Index: lams_tool_forum/web/jsps/learning/message/topicview.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/message/topicview.jsp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_forum/web/jsps/learning/message/topicview.jsp 9 Nov 2005 05:28:27 -0000 1.1 @@ -0,0 +1,58 @@ +
+
+
+
+ + + + + + + + + + + + + + + + +
+ +
+ - + + +
+
+ +
+
+ + + + + + + + +
+
+ + + + + + + + + + + + + +
+
+
+