Index: lams_tool_larsrc/conf/language/ApplicationResources.properties
===================================================================
diff -u -r71cccb6c7558909803c2886472385427cdc4a281 -red04e2e75728d635ec5c4530bcebe69ab32d9cdb
--- lams_tool_larsrc/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision 71cccb6c7558909803c2886472385427cdc4a281)
+++ lams_tool_larsrc/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision ed04e2e75728d635ec5c4530bcebe69ab32d9cdb)
@@ -150,4 +150,12 @@
#======= End labels: Exported 141 labels for en AU =====
-label.monitoring.heading.access=Learners list
\ No newline at end of file
+label.monitoring.heading.access=Learners list
+label.authoring.advanced.reflectOnActivity=Reflect on share resources
+error.reflection.emtpy=Please input reflection
+title.reflection=Reflection
+label.continue=Continue
+monitoring.user.fullname=Name
+monitoring.user.reflection=Refection
+page.title.monitoring.view.reflection=View Reflection
+button.close=Close
\ No newline at end of file
Index: lams_tool_larsrc/conf/xdoclet/struts-actions.xml
===================================================================
diff -u -r671e0f31315ba99ec13f82789869ce2a01e0ea04 -red04e2e75728d635ec5c4530bcebe69ab32d9cdb
--- lams_tool_larsrc/conf/xdoclet/struts-actions.xml (.../struts-actions.xml) (revision 671e0f31315ba99ec13f82789869ce2a01e0ea04)
+++ lams_tool_larsrc/conf/xdoclet/struts-actions.xml (.../struts-actions.xml) (revision ed04e2e75728d635ec5c4530bcebe69ab32d9cdb)
@@ -164,7 +164,7 @@
type="org.lamsfoundation.lams.tool.rsrc.web.action.LearningAction"
input="/pages/learning/learning.jsp"
parameter="finish" >
-
+
@@ -197,6 +197,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql
===================================================================
diff -u -rc25a2c783e51d05045d1fb61981c169357cd3e98 -red04e2e75728d635ec5c4530bcebe69ab32d9cdb
--- lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql (.../create_lams_tool_rsrc.sql) (revision c25a2c783e51d05045d1fb61981c169357cd3e98)
+++ lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql (.../create_lams_tool_rsrc.sql) (revision ed04e2e75728d635ec5c4530bcebe69ab32d9cdb)
@@ -41,6 +41,8 @@
allow_add_urls tinyint,
mini_view_resource_number integer,
allow_auto_run tinyint,
+ reflect_instructions varchar(255),
+ reflect_on_activity smallint,
primary key (uid)
);
create table tl_larsrc11_resource_item (
@@ -109,6 +111,6 @@
-INSERT INTO `tl_larsrc11_resource` (`uid`, `create_date`, `update_date`, `create_by`, `title`, `run_offline`, `lock_on_finished`, `instructions`, `online_instructions`, `offline_instructions`, `content_in_use`, `define_later`, `content_id`, `allow_add_files`, `allow_add_urls`, `mini_view_resource_number`, `allow_auto_run`) VALUES
- (2,NULL,NULL,NULL,'Shared Resources','0','0','Instruction','Online instruction','Offline instruction',0,0,${default_content_id},1,1,0,1);
+INSERT INTO `tl_larsrc11_resource` (`uid`, `create_date`, `update_date`, `create_by`, `title`, `run_offline`, `lock_on_finished`, `instructions`, `online_instructions`, `offline_instructions`, `content_in_use`, `define_later`, `content_id`, `allow_add_files`, `allow_add_urls`, `mini_view_resource_number`, `allow_auto_run`,`reflect_on_activity`) VALUES
+ (2,NULL,NULL,NULL,'Shared Resources','0','0','Instruction','Online instruction','Offline instruction',0,0,${default_content_id},1,1,0,1,0);
SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
Index: lams_tool_larsrc/db/sql/table-schema.sql
===================================================================
diff -u -rc25a2c783e51d05045d1fb61981c169357cd3e98 -red04e2e75728d635ec5c4530bcebe69ab32d9cdb
--- lams_tool_larsrc/db/sql/table-schema.sql (.../table-schema.sql) (revision c25a2c783e51d05045d1fb61981c169357cd3e98)
+++ lams_tool_larsrc/db/sql/table-schema.sql (.../table-schema.sql) (revision ed04e2e75728d635ec5c4530bcebe69ab32d9cdb)
@@ -7,8 +7,8 @@
alter table tl_larsrc11_resource_item drop foreign key FKF52D1F93EC0D3147;
alter table tl_larsrc11_resource_item drop foreign key FKF52D1F93758092FB;
alter table tl_larsrc11_session drop foreign key FK24AA78C530E79035;
+alter table tl_larsrc11_user drop foreign key FK30113BFC30E79035;
alter table tl_larsrc11_user drop foreign key FK30113BFCEC0D3147;
-alter table tl_larsrc11_user drop foreign key FK30113BFC309ED320;
drop table if exists tl_larsrc11_attachment;
drop table if exists tl_larsrc11_item_instruction;
drop table if exists tl_larsrc11_item_log;
@@ -19,10 +19,10 @@
create table tl_larsrc11_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, resource_uid bigint, primary key (uid));
create table tl_larsrc11_item_instruction (uid bigint not null auto_increment, description varchar(255), sequence_id integer, item_uid bigint, primary key (uid));
create table tl_larsrc11_item_log (uid bigint not null auto_increment, access_date datetime, resource_item_uid bigint, user_uid bigint, complete bit, session_id bigint, primary key (uid));
-create table tl_larsrc11_resource (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), 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_add_files bit, allow_add_urls bit, mini_view_resource_number integer, allow_auto_run bit, primary key (uid));
+create table tl_larsrc11_resource (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), 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_add_files bit, allow_add_urls bit, mini_view_resource_number integer, allow_auto_run bit, reflect_instructions varchar(255), reflect_on_activity bit, primary key (uid));
create table tl_larsrc11_resource_item (uid bigint not null auto_increment, file_uuid bigint, file_version_id bigint, description varchar(255), ims_schema varchar(255), init_item varchar(255), organization_xml text, title varchar(255), url text, create_by bigint, create_date datetime, create_by_author bit, is_hide bit, item_type smallint, file_type varchar(255), file_name varchar(255), open_url_new_window bit, resource_uid bigint, session_uid bigint, primary key (uid));
create table tl_larsrc11_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, resource_uid bigint, session_id bigint, session_name varchar(250), primary key (uid));
-create table tl_larsrc11_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), first_name varchar(255), login_name varchar(255), session_uid bigint, content_uid bigint, session_finished bit, primary key (uid));
+create table tl_larsrc11_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), first_name varchar(255), login_name varchar(255), session_uid bigint, resource_uid bigint, session_finished bit, primary key (uid));
alter table tl_larsrc11_attachment add index FK1E7009430E79035 (resource_uid), add constraint FK1E7009430E79035 foreign key (resource_uid) references tl_larsrc11_resource (uid);
alter table tl_larsrc11_item_instruction add index FKA5665013980570ED (item_uid), add constraint FKA5665013980570ED foreign key (item_uid) references tl_larsrc11_resource_item (uid);
alter table tl_larsrc11_item_log add index FK63195BC938BF8DFE (resource_item_uid), add constraint FK63195BC938BF8DFE foreign key (resource_item_uid) references tl_larsrc11_resource_item (uid);
@@ -32,5 +32,5 @@
alter table tl_larsrc11_resource_item add index FKF52D1F93EC0D3147 (session_uid), add constraint FKF52D1F93EC0D3147 foreign key (session_uid) references tl_larsrc11_session (uid);
alter table tl_larsrc11_resource_item add index FKF52D1F93758092FB (create_by), add constraint FKF52D1F93758092FB foreign key (create_by) references tl_larsrc11_user (uid);
alter table tl_larsrc11_session add index FK24AA78C530E79035 (resource_uid), add constraint FK24AA78C530E79035 foreign key (resource_uid) references tl_larsrc11_resource (uid);
+alter table tl_larsrc11_user add index FK30113BFC30E79035 (resource_uid), add constraint FK30113BFC30E79035 foreign key (resource_uid) references tl_larsrc11_resource (uid);
alter table tl_larsrc11_user add index FK30113BFCEC0D3147 (session_uid), add constraint FK30113BFCEC0D3147 foreign key (session_uid) references tl_larsrc11_session (uid);
-alter table tl_larsrc11_user add index FK30113BFC309ED320 (content_uid), add constraint FK30113BFC309ED320 foreign key (content_uid) references tl_larsrc11_resource (uid);
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java
===================================================================
diff -u -re76c3706b6db1d6af4fc1c15a0afabbf2ad04d4d -red04e2e75728d635ec5c4530bcebe69ab32d9cdb
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java (.../ResourceConstants.java) (revision e76c3706b6db1d6af4fc1c15a0afabbf2ad04d4d)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java (.../ResourceConstants.java) (revision ed04e2e75728d635ec5c4530bcebe69ab32d9cdb)
@@ -72,10 +72,10 @@
public static final String ATTR_RESOURCE_INSTRUCTION = "instructions";
public static final String ATTR_FINISH_LOCK = "finishedLock";
public static final String ATTR_SESSION_MAP_ID = "sessionMapID";
- public static final Object ATTR_RESOURCE_FORM = "resourceForm";
+ public static final String ATTR_RESOURCE_FORM = "resourceForm";
public static final String ATTR_ADD_RESOURCE_TYPE = "addType";
public static final String ATTR_FILE_TYPE_FLAG = "fileTypeFlag";
- public static final Object ATTR_TITLE = "title";
+ public static final String ATTR_TITLE = "title";
//error message keys
public static final String ERROR_MSG_TITLE_BLANK = "error.resource.item.title.blank";
@@ -88,5 +88,9 @@
public static final String PAGE_EDITABLE = "isPageEditable";
public static final String MODE_AUTHOR_SESSION = "author_session";
+ public static final String ATTR_REFLECTION_ON = "reflectOn";
+ public static final String ATTR_REFLECTION_INSTRUCTION = "reflectInstructions";
+ public static final String ATTR_REFLECT_LIST = "reflectList";
+ public static final String ATTR_USER_UID = "userUid";
}
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/ResourceUserDAO.java
===================================================================
diff -u -rc25a2c783e51d05045d1fb61981c169357cd3e98 -red04e2e75728d635ec5c4530bcebe69ab32d9cdb
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/ResourceUserDAO.java (.../ResourceUserDAO.java) (revision c25a2c783e51d05045d1fb61981c169357cd3e98)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/ResourceUserDAO.java (.../ResourceUserDAO.java) (revision ed04e2e75728d635ec5c4530bcebe69ab32d9cdb)
@@ -23,6 +23,8 @@
/* $$Id$$ */
package org.lamsfoundation.lams.tool.rsrc.dao;
+import java.util.List;
+
import org.lamsfoundation.lams.tool.rsrc.model.ResourceUser;
public interface ResourceUserDAO extends DAO {
@@ -31,4 +33,5 @@
ResourceUser getUserByUserIDAndContentID(Long userId, Long contentId);
+ List getBySessionID(Long sessionId);
}
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceUserDAOHibernate.java
===================================================================
diff -u -r94866457dd89a14fdab60779c3cd30c4b078b659 -red04e2e75728d635ec5c4530bcebe69ab32d9cdb
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceUserDAOHibernate.java (.../ResourceUserDAOHibernate.java) (revision 94866457dd89a14fdab60779c3cd30c4b078b659)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceUserDAOHibernate.java (.../ResourceUserDAOHibernate.java) (revision ed04e2e75728d635ec5c4530bcebe69ab32d9cdb)
@@ -33,6 +33,7 @@
private static final String FIND_BY_USER_ID_CONTENT_ID = "from " + ResourceUser.class.getName() + " as u where u.userId =? and u.resource.contentId=?";
private static final String FIND_BY_USER_ID_SESSION_ID = "from " + ResourceUser.class.getName() + " as u where u.userId =? and u.session.sessionId=?";
+ private static final String FIND_BY_SESSION_ID = "from " + ResourceUser.class.getName() + " as u where u.session.sessionId=?";
public ResourceUser getUserByUserIDAndSessionID(Long userID, Long sessionId) {
List list = this.getHibernateTemplate().find(FIND_BY_USER_ID_SESSION_ID,new Object[]{userID,sessionId});
@@ -48,5 +49,9 @@
return (ResourceUser) list.get(0);
}
+ public List getBySessionID(Long sessionId) {
+ return this.getHibernateTemplate().find(FIND_BY_SESSION_ID,sessionId);
+ }
+
}
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/ReflectDTO.java
===================================================================
diff -u
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/ReflectDTO.java (revision 0)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/ReflectDTO.java (revision ed04e2e75728d635ec5c4530bcebe69ab32d9cdb)
@@ -0,0 +1,67 @@
+package org.lamsfoundation.lams.tool.rsrc.dto;
+
+import org.lamsfoundation.lams.tool.rsrc.model.ResourceUser;
+
+/**
+ *
+ * @author Dapeng Ni
+ *
+ */
+public class ReflectDTO {
+ private Long userUid;
+ private String fullName;
+ private String loginName;
+ private boolean hasRefection;
+ private String reflectInstrctions;
+ private boolean finishReflection;
+ private String reflect;
+
+ public ReflectDTO(ResourceUser user) {
+ this.setLoginName(user.getLoginName());
+ this.setFullName(user.getFirstName()+" "+user.getLastName());
+ this.setUserUid(user.getUid());
+ }
+
+ public boolean isFinishReflection() {
+ return finishReflection;
+ }
+ public void setFinishReflection(boolean finishReflection) {
+ this.finishReflection = finishReflection;
+ }
+ 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 String getReflect() {
+ return reflect;
+ }
+ public void setReflect(String reflect) {
+ this.reflect = reflect;
+ }
+ public String getReflectInstrctions() {
+ return reflectInstrctions;
+ }
+ public void setReflectInstrctions(String reflectInstrctions) {
+ this.reflectInstrctions = reflectInstrctions;
+ }
+ public Long getUserUid() {
+ return userUid;
+ }
+ public void setUserUid(Long userUid) {
+ this.userUid = userUid;
+ }
+}
Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.hbm.xml
===================================================================
diff -u -rd4d46f925789ad7702b486b240867bdaa05e93f9 -red04e2e75728d635ec5c4530bcebe69ab32d9cdb
--- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.hbm.xml (.../Resource.hbm.xml) (revision d4d46f925789ad7702b486b240867bdaa05e93f9)
+++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.hbm.xml (.../Resource.hbm.xml) (revision ed04e2e75728d635ec5c4530bcebe69ab32d9cdb)
@@ -196,6 +196,22 @@
column="allow_auto_run"
/>
+
+
+
+
-
+
|
-
+
|
@@ -39,16 +39,28 @@
-
+
|
-
+
|
+
+
+
+
+
+ |
+
+
+
+
+ |
+
\ No newline at end of file
Index: lams_tool_larsrc/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r671e0f31315ba99ec13f82789869ce2a01e0ea04 -red04e2e75728d635ec5c4530bcebe69ab32d9cdb
--- lams_tool_larsrc/web/pages/authoring/authoring.jsp (.../authoring.jsp) (revision 671e0f31315ba99ec13f82789869ce2a01e0ea04)
+++ lams_tool_larsrc/web/pages/authoring/authoring.jsp (.../authoring.jsp) (revision ed04e2e75728d635ec5c4530bcebe69ab32d9cdb)
@@ -51,7 +51,7 @@
//for advanceTab
if(tabId == 2)
- changeViewNum();
+ changeViewNum(-1);
}
function doUploadOnline() {
@@ -65,25 +65,29 @@
myForm.submit();
}
- function changeViewNum(){
+ function changeViewNum(initVal){
var tb = document.getElementById("itemTable");
var num = tb.getElementsByTagName("tr");
var sel = document.getElementById("viewNumList");
var newField = sel.options;
var len = sel.length;
- var selIdx=-1;
+
+ //when first enter, it should get value from Resource
+ var selIdx=initVal < 0?-1:initVal;
//there is bug in Opera8.5: if add alert before this loop, it will work,weird.
for (var idx=0;idx 0 && selIdx==i){
opt.selected = true;
}else{
@@ -152,5 +156,9 @@
+
+
Index: lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp
===================================================================
diff -u -r92e8b8d1454cfbd9ae8a20934a677340dac3b507 -red04e2e75728d635ec5c4530bcebe69ab32d9cdb
--- lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp (.../instructionsnav.jsp) (revision 92e8b8d1454cfbd9ae8a20934a677340dac3b507)
+++ lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp (.../instructionsnav.jsp) (revision ed04e2e75728d635ec5c4530bcebe69ab32d9cdb)
@@ -1,6 +1,8 @@
<%@ include file="/common/taglibs.jsp"%>
+
+