Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Attic/Forum.hbm.xml,v diff -u -r1.16 -r1.17 --- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml 8 Aug 2006 06:39:36 -0000 1.16 +++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml 30 Aug 2006 06:37:35 -0000 1.17 @@ -236,6 +236,22 @@ column="minimum_reply" /> + + + + + + + + + + + + @@ -292,6 +312,11 @@ parameter="viewTopicTree"> + + + 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.24 -r1.25 --- lams_tool_forum/db/sql/create_lams_tool_forum.sql 23 Aug 2006 06:54:00 -0000 1.24 +++ lams_tool_forum/db/sql/create_lams_tool_forum.sql 30 Aug 2006 06:37:37 -0000 1.25 @@ -42,6 +42,8 @@ minimum_reply integer, limited_of_chars integer, limited_input_flag smallint, + reflect_instructions varchar(255), + reflect_on_activity smallint, primary key (uid) ); create table tl_lafrum11_forum_user ( @@ -113,5 +115,5 @@ alter table tl_lafrum11_tool_session add index FK5A04D7AE131CE31E (forum_uid), add constraint FK5A04D7AE131CE31E foreign key (forum_uid) references tl_lafrum11_forum (uid); -INSERT INTO tl_lafrum11_forum (title,instructions,online_instructions,offline_instructions,content_id,allow_anonym,run_offline,lock_on_finished,content_in_use,define_later,allow_edit,allow_rich_editor, allow_new_topic,allow_upload,maximum_reply, minimum_reply,limited_input_flag,limited_of_chars) VALUES("LAMS Forum","Instruction","Online instruction","Offline instruction",${default_content_id},0,0,0,0,0,1,0,1,1,0,0,1,5000); +INSERT INTO tl_lafrum11_forum (title,instructions,online_instructions,offline_instructions,content_id,allow_anonym,run_offline,lock_on_finished,content_in_use,define_later,allow_edit,allow_rich_editor, allow_new_topic,allow_upload,maximum_reply, minimum_reply,limited_input_flag,limited_of_chars,reflect_on_activity) VALUES("LAMS Forum","Instruction","Online instruction","Offline instruction",${default_content_id},0,0,0,0,0,1,0,1,1,0,0,1,5000,0); SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file 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.21 -r1.22 --- lams_tool_forum/db/sql/table-schema.sql 23 Aug 2006 06:54:00 -0000 1.21 +++ lams_tool_forum/db/sql/table-schema.sql 30 Aug 2006 06:37:37 -0000 1.22 @@ -19,7 +19,7 @@ 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, allow_new_topic bit, allow_upload bit, maximum_reply integer, minimum_reply integer, 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, allow_new_topic bit, allow_upload bit, maximum_reply integer, minimum_reply integer, reflect_instructions varchar(255), reflect_on_activity 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), session_finished bit, 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)); 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.13 -r1.14 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml 29 Aug 2006 05:01:48 -0000 1.13 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml 30 Aug 2006 06:37:40 -0000 1.14 @@ -105,6 +105,7 @@ + Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/UserDTO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/UserDTO.java,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/UserDTO.java 30 Aug 2006 06:37:40 -0000 1.1 @@ -0,0 +1,77 @@ +package org.lamsfoundation.lams.tool.forum.dto; + +import org.lamsfoundation.lams.tool.forum.persistence.ForumUser; + +public class UserDTO { + + private Long userUid; + private String fullName; + private String loginName; + private int noOfPosts; + private boolean hasRefection; + private String reflectInstrctions; + private boolean finishReflection; + private String reflect; + + public UserDTO(){ + } + + public UserDTO(ForumUser user) { + this.setLoginName(user.getLoginName()); + this.setFullName(user.getFirstName()+" "+user.getLastName()); + this.setUserUid(user.getUid()); + + } + public String getFullName() { + return fullName; + } + public void setFullName(String fullName) { + this.fullName = fullName; + } + public boolean isHasRefection() { + return hasRefection; + } + public void setHasRefection(boolean hasRefection) { + this.hasRefection = hasRefection; + } + public String getLoginName() { + return loginName; + } + public void setLoginName(String loginName) { + this.loginName = loginName; + } + public int getNoOfPosts() { + return noOfPosts; + } + public void setNoOfPosts(int noOfPosts) { + this.noOfPosts = noOfPosts; + } + public Long getUserUid() { + return userUid; + } + public void setUserUid(Long userUid) { + this.userUid = userUid; + } + public String getReflect() { + return reflect; + } + public void setReflect(String reflection) { + this.reflect = reflection; + } + + public String getReflectInstrctions() { + return reflectInstrctions; + } + + public void setReflectInstrctions(String reflectInstrctions) { + this.reflectInstrctions = reflectInstrctions; + } + + public boolean isFinishReflection() { + return finishReflection; + } + + public void setFinishReflection(boolean finishReflection) { + this.finishReflection = finishReflection; + } +} Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Attic/Forum.hbm.xml,v diff -u -r1.16 -r1.17 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml 8 Aug 2006 06:39:36 -0000 1.16 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Forum.hbm.xml 30 Aug 2006 06:37:35 -0000 1.17 @@ -236,6 +236,22 @@ column="minimum_reply" /> + + + + + + + + + + + + + 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.31 -r1.32 --- lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml 23 Aug 2006 05:42:17 -0000 1.31 +++ lams_tool_forum/web/WEB-INF/struts/tiles-defs.xml 30 Aug 2006 06:37:38 -0000 1.32 @@ -90,6 +90,10 @@ + + + + @@ -125,6 +129,10 @@ + + + + Index: lams_tool_forum/web/jsps/authoring/advance.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/advance.jsp,v diff -u -r1.16 -r1.17 --- lams_tool_forum/web/jsps/authoring/advance.jsp 23 Aug 2006 01:08:21 -0000 1.16 +++ lams_tool_forum/web/jsps/authoring/advance.jsp 30 Aug 2006 06:37:40 -0000 1.17 @@ -7,42 +7,54 @@ - + - + - + - + - + + + + + + + + + + + + +

@@ -145,6 +157,15 @@ } allowNewTopic(); + function checkReflection(){ + var ropt = document.getElementById("reflectOn"); + var rins = document.getElementById("reflectInstructions"); + if(ropt.checked){ + rins.disabled=false; + }else{ + rins.disabled=true; + } + } Index: lams_tool_forum/web/jsps/learning/notebook.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/notebook.jsp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_forum/web/jsps/learning/notebook.jsp 30 Aug 2006 06:37:39 -0000 1.1 @@ -0,0 +1,42 @@ +<%@ include file="/common/taglibs.jsp"%> + + + + + + + +

+ ${sessionMap.title} +

+
+
+ + + + + + + + + + + + + + + +
+ <%@ include file="/common/messages.jsp"%> +
+ ${sessionMap.reflectInstructions} +
+ +
+ + + +
+
+
+ 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.11 -r1.12 --- lams_tool_forum/web/jsps/learning/viewforum.jsp 23 Aug 2006 01:08:20 -0000 1.11 +++ lams_tool_forum/web/jsps/learning/viewforum.jsp 30 Aug 2006 06:37:39 -0000 1.12 @@ -36,8 +36,11 @@ + + + - +
@@ -54,9 +57,18 @@
- - - + + + + + + + + + + + +
Index: lams_tool_forum/web/jsps/monitoring/notebook.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/Attic/notebook.jsp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_forum/web/jsps/monitoring/notebook.jsp 30 Aug 2006 06:37:40 -0000 1.1 @@ -0,0 +1,39 @@ +<%@ include file="/common/taglibs.jsp"%> + + + + + + + + + + + +
+

+ ${userDTO.fullName} +

+
+

+ ${userDTO.reflectInstrctions} +

+
+ + + + + + + + +
+ + + + +
+ +
+ + 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.5 -r1.6 --- lams_tool_forum/web/jsps/monitoring/summary.jsp 23 Aug 2006 01:08:22 -0000 1.5 +++ lams_tool_forum/web/jsps/monitoring/summary.jsp 30 Aug 2006 06:37:40 -0000 1.6 @@ -53,26 +53,54 @@ - + + - - - : - - + +

+ : +

+ - + + + + + + + + + + + + + + - +
+ + + + + +  
- - + + + + + + + + + + - + @@ -81,15 +109,16 @@
+