Index: lams_tool_larsrc/build.properties =================================================================== diff -u -ra20a8a284fe4d12369cefbec952022b58f437811 -r1e60aa03eaba4201ac26e9e54eb7f4cefbf8b2f8 --- lams_tool_larsrc/build.properties (.../build.properties) (revision a20a8a284fe4d12369cefbec952022b58f437811) +++ lams_tool_larsrc/build.properties (.../build.properties) (revision 1e60aa03eaba4201ac26e9e54eb7f4cefbf8b2f8) @@ -13,7 +13,7 @@ weblib=lib #project version -tool.version=20090818 +tool.version=20110810 # hide tool option hideTool=false Index: lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql =================================================================== diff -u -ra20a8a284fe4d12369cefbec952022b58f437811 -r1e60aa03eaba4201ac26e9e54eb7f4cefbf8b2f8 --- lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql (.../create_lams_tool_rsrc.sql) (revision a20a8a284fe4d12369cefbec952022b58f437811) +++ lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql (.../create_lams_tool_rsrc.sql) (revision 1e60aa03eaba4201ac26e9e54eb7f4cefbf8b2f8) @@ -72,6 +72,7 @@ create table tl_larsrc11_item_log ( uid bigint not null auto_increment, access_date datetime, + complete_date datetime, resource_item_uid bigint, user_uid bigint, complete tinyint, Index: lams_tool_larsrc/db/sql/table-schema.sql =================================================================== diff -u -r05ab55ef4acdc0c374af7405c58fb0e0fe8eb6b7 -r1e60aa03eaba4201ac26e9e54eb7f4cefbf8b2f8 --- lams_tool_larsrc/db/sql/table-schema.sql (.../table-schema.sql) (revision 05ab55ef4acdc0c374af7405c58fb0e0fe8eb6b7) +++ lams_tool_larsrc/db/sql/table-schema.sql (.../table-schema.sql) (revision 1e60aa03eaba4201ac26e9e54eb7f4cefbf8b2f8) @@ -18,7 +18,7 @@ drop table if exists tl_larsrc11_user; 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_item_log (uid bigint not null auto_increment, access_date datetime, complete_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, reflect_instructions varchar(255), reflect_on_activity bit,assigment_submit_notify tinyint DEFAULT 0, 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)); Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20110810_updateFrom235.sql =================================================================== diff -u --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20110810_updateFrom235.sql (revision 0) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20110810_updateFrom235.sql (revision 1e60aa03eaba4201ac26e9e54eb7f4cefbf8b2f8) @@ -0,0 +1,15 @@ +-- SQL statements to update from LAMS 2.3.5 + +-- Turn off autocommit, so nothing is committed if there is an error +SET AUTOCOMMIT = 0; + +----------------------Put all sql statements below here------------------------- + +-- LDEV-2705 Improve reporting for Share Resources +ALTER TABLE tl_larsrc11_item_log ADD COLUMN complete_date datetime DEFAULT NULL; + +----------------------Put all sql statements above here------------------------- + +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; \ No newline at end of file Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemVisitLog.hbm.xml =================================================================== diff -u -r920894ca746cba5e080023c5cc80167d64d1653d -r1e60aa03eaba4201ac26e9e54eb7f4cefbf8b2f8 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemVisitLog.hbm.xml (.../ResourceItemVisitLog.hbm.xml) (revision 920894ca746cba5e080023c5cc80167d64d1653d) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemVisitLog.hbm.xml (.../ResourceItemVisitLog.hbm.xml) (revision 1e60aa03eaba4201ac26e9e54eb7f4cefbf8b2f8) @@ -33,6 +33,14 @@ column="access_date" /> + + + - <%@ include file="/common/taglibs.jsp"%> - <%@ include file="/common/header.jsp" %> + + + + + + + + + + + + + + + + + + - -
+
-

- -

+

+ +

+ +
- - - - - - - +
- - - - - -
+ - - - + + + + + - - - - + + + + + + + + + + + + +
- ${user.loginName} - - - - ${user.firstName},${user.lastName} - + + + + + + + + + +
- Close -
+ ${user.firstName},${user.lastName} + + ${user.loginName} + + + + + + +
+ +
+ +
+
+ + + + + + +
+
+ +
+ Close +
- -
+ + \ No newline at end of file