Index: lams_tool_larsrc/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -rb93c0a14919af5bff7e1a99168c91f4057799c51 -r05ab55ef4acdc0c374af7405c58fb0e0fe8eb6b7 --- lams_tool_larsrc/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision b93c0a14919af5bff7e1a99168c91f4057799c51) +++ lams_tool_larsrc/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 05ab55ef4acdc0c374af7405c58fb0e0fe8eb6b7) @@ -173,5 +173,8 @@ monitor.summary.td.addNotebook =Add Notebook at end of Shared Resources monitor.summary.td.notebookInstructions =Notebook instructions +label.authoring.advanced.notify.onassigmentsubmit=Notify monitoring teachers when a learner submits an assigment +event.assigment.submit.subject=LAMS: A learner submitted an assigment in a Shared Resources tool +event.assigment.submit.body=The learner {0} submitted an assigment in a Shared Resources tool.\n\nThis message was send automatically, following tool's advanced settings. #======= End labels: Exported 166 labels for en AU ===== Index: lams_tool_larsrc/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -rb93c0a14919af5bff7e1a99168c91f4057799c51 -r05ab55ef4acdc0c374af7405c58fb0e0fe8eb6b7 --- lams_tool_larsrc/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision b93c0a14919af5bff7e1a99168c91f4057799c51) +++ lams_tool_larsrc/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 05ab55ef4acdc0c374af7405c58fb0e0fe8eb6b7) @@ -173,5 +173,8 @@ monitor.summary.td.addNotebook =Add Notebook at end of Shared Resources monitor.summary.td.notebookInstructions =Notebook instructions +label.authoring.advanced.notify.onassigmentsubmit=Notify monitoring teachers when a learner submits an assigment +event.assigment.submit.subject=LAMS: A learner submitted an assigment in a Shared Resources tool +event.assigment.submit.body=The learner {0} submitted an assigment in a Shared Resources tool.\n\nThis message was send automatically, following tool's advanced settings. #======= End labels: Exported 166 labels for en AU ===== Index: lams_tool_larsrc/db/model/resource.clay =================================================================== diff -u -r4812e830a27ccc4127bc6f3043258b16776f314b -r05ab55ef4acdc0c374af7405c58fb0e0fe8eb6b7 --- lams_tool_larsrc/db/model/resource.clay (.../resource.clay) (revision 4812e830a27ccc4127bc6f3043258b16776f314b) +++ lams_tool_larsrc/db/model/resource.clay (.../resource.clay) (revision 05ab55ef4acdc0c374af7405c58fb0e0fe8eb6b7) @@ -1,23 +1,23 @@ - - - - + + + + - - + + - - + + - - +
+ - - + + @@ -29,8 +29,8 @@ - - + + @@ -42,22 +42,22 @@ - - + + - - + + - - + + @@ -69,14 +69,14 @@ - - + + - - + + @@ -89,37 +89,37 @@ - - + + - - + + - - + + - - + +
- - +
+ - - + + @@ -131,15 +131,15 @@ - - + + - - + + @@ -151,8 +151,8 @@ - - + + @@ -165,37 +165,37 @@ - - + + - - + + - - + + - - + +
- - - +
+ + - - + + @@ -207,20 +207,20 @@ - - + + - - + + - - + + @@ -232,57 +232,57 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -294,20 +294,20 @@ - - + + - - + + - - + + @@ -319,48 +319,61 @@ - - + + + + + + + + + + + + + + + - - + + - - + + - - + + - - + + - - + +
- - +
+ - - + + @@ -372,8 +385,8 @@ - - + + @@ -385,8 +398,8 @@ - - + + @@ -398,48 +411,48 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -451,26 +464,26 @@ - - + + - - + + - - + + - - + + @@ -482,22 +495,22 @@ - - + + - - + + - - + + @@ -509,8 +522,8 @@ - - + + @@ -523,59 +536,59 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + +
- - +
+ - - + + @@ -587,14 +600,14 @@ - - + + - - + + @@ -606,8 +619,8 @@ - - + + @@ -619,55 +632,55 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + +
- - +
+ - - + + @@ -679,20 +692,20 @@ - - + + - - + + - - + + @@ -704,8 +717,8 @@ - - + + @@ -717,8 +730,8 @@ - - + + @@ -730,45 +743,45 @@ - - + + - - + + - - + + - - + + - - + +
- - +
+ - - + + @@ -780,8 +793,8 @@ - - + + @@ -793,29 +806,29 @@ - - + + - - + + - - + + - - + + @@ -828,27 +841,27 @@ - - + + - - + + - - + + - - + + Index: lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql =================================================================== diff -u -r98f10c35c8f290b7f3bcea1908f22cd77e7e8943 -r05ab55ef4acdc0c374af7405c58fb0e0fe8eb6b7 --- lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql (.../create_lams_tool_rsrc.sql) (revision 98f10c35c8f290b7f3bcea1908f22cd77e7e8943) +++ lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql (.../create_lams_tool_rsrc.sql) (revision 05ab55ef4acdc0c374af7405c58fb0e0fe8eb6b7) @@ -42,7 +42,8 @@ mini_view_resource_number integer, allow_auto_run tinyint, reflect_instructions varchar(255), - reflect_on_activity smallint, + reflect_on_activity smallint, + assigment_submit_notify tinyint DEFAULT 0, primary key (uid) )type=innodb; create table tl_larsrc11_resource_item ( Index: lams_tool_larsrc/db/sql/table-schema.sql =================================================================== diff -u -red04e2e75728d635ec5c4530bcebe69ab32d9cdb -r05ab55ef4acdc0c374af7405c58fb0e0fe8eb6b7 --- lams_tool_larsrc/db/sql/table-schema.sql (.../table-schema.sql) (revision ed04e2e75728d635ec5c4530bcebe69ab32d9cdb) +++ lams_tool_larsrc/db/sql/table-schema.sql (.../table-schema.sql) (revision 05ab55ef4acdc0c374af7405c58fb0e0fe8eb6b7) @@ -19,7 +19,7 @@ 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, reflect_instructions varchar(255), reflect_on_activity 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,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)); 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)); Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java =================================================================== diff -u -r4fa914b7cc5b4c7416f7ed1387406702f9679e7a -r05ab55ef4acdc0c374af7405c58fb0e0fe8eb6b7 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java (.../ResourceConstants.java) (revision 4fa914b7cc5b4c7416f7ed1387406702f9679e7a) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java (.../ResourceConstants.java) (revision 05ab55ef4acdc0c374af7405c58fb0e0fe8eb6b7) @@ -25,80 +25,133 @@ public class ResourceConstants { public static final String TOOL_SIGNATURE = "larsrc11"; + public static final String RESOURCE_SERVICE = "resourceService"; + public static final String TOOL_CONTENT_HANDLER_NAME = "resourceToolContentHandler"; public static final int COMPLETED = 1; - + //resource type; public static final short RESOURCE_TYPE_URL = 1; + public static final short RESOURCE_TYPE_FILE = 2; + public static final short RESOURCE_TYPE_WEBSITE = 3; + public static final short RESOURCE_TYPE_LEARNING_OBJECT = 4; - + //for action forward name public static final String SUCCESS = "success"; + public static final String ERROR = "error"; + public static final String DEFINE_LATER = "definelater"; - + //for parameters' name public static final String PARAM_TOOL_CONTENT_ID = "toolContentID"; - public static final String PARAM_TOOL_SESSION_ID = "toolSessionID"; + + public static final String PARAM_TOOL_SESSION_ID = "toolSessionID"; + public static final String PARAM_FILE_VERSION_ID = "fileVersionId"; + public static final String PARAM_FILE_UUID = "fileUuid"; + public static final String PARAM_ITEM_INDEX = "itemIndex"; + public static final String PARAM_RESOURCE_ITEM_UID = "itemUid"; + public static final String PARAM_CURRENT_INSTRUCTION_INDEX = "insIdx"; + public static final String PARAM_RUN_OFFLINE = "runOffline"; + public static final String PARAM_OPEN_URL_POPUP = "popupUrl"; + public static final String PARAM_TITLE = "title"; - + //for request attribute name public static final String ATTR_TOOL_CONTENT_ID = "toolContentID"; - public static final String ATTR_TOOL_SESSION_ID = "toolSessionID"; + + public static final String ATTR_TOOL_SESSION_ID = "toolSessionID"; + public static final String ATTR_INSTRUCTION_LIST = "instructionList"; + public static final String ATTR_RESOURCE_ITEM_LIST = "resourceList"; + public static final String ATT_ATTACHMENT_LIST = "instructionAttachmentList"; + public static final String ATTR_DELETED_RESOURCE_ITEM_LIST = "deleteResourceList"; + public static final String ATTR_DELETED_ATTACHMENT_LIST = "deletedAttachmmentList"; - public static final String ATTR_DELETED_RESOURCE_ITEM_ATTACHMENT_LIST = "deletedItemAttachmmentList";; + + public static final String ATTR_DELETED_RESOURCE_ITEM_ATTACHMENT_LIST = "deletedItemAttachmmentList";; + public static final String ATT_LEARNING_OBJECT = "cpPackage"; + public static final String ATTR_RESOURCE_REVIEW_URL = "resourceItemReviewUrl"; + public static final String ATTR_RESOURCE = "resource"; + public static final String ATTR_RUN_AUTO = "runAuto"; + public static final String ATTR_RESOURCE_ITEM_UID = "itemUid"; + public static final String ATTR_NEXT_ACTIVITY_URL = "nextActivityUrl"; + public static final String ATTR_SUMMARY_LIST = "summaryList"; + public static final String ATTR_USER_LIST = "userList"; + public static final String ATTR_RESOURCE_INSTRUCTION = "instructions"; + public static final String ATTR_FINISH_LOCK = "finishedLock"; + public static final String ATTR_LOCK_ON_FINISH = "lockOnFinish"; + public static final String ATTR_SESSION_MAP_ID = "sessionMapID"; + 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 String ATTR_TITLE = "title"; + public static final String ATTR_INSTRUCTIONS = "instructions"; + public static final String ATTR_USER_FINISHED = "userFinished"; - + //error message keys public static final String ERROR_MSG_TITLE_BLANK = "error.resource.item.title.blank"; + public static final String ERROR_MSG_URL_BLANK = "error.resource.item.url.blank"; + public static final String ERROR_MSG_DESC_BLANK = "error.resource.item.desc.blank"; + public static final String ERROR_MSG_FILE_BLANK = "error.resource.item.file.blank"; + public static final String ERROR_MSG_INVALID_URL = "error.resource.item.invalid.url"; + public static final String ERROR_MSG_UPLOAD_FAILED = "error.upload.failed"; - - + 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_REFLECTION_ENTRY = "reflectEntry"; - + public static final String ATTR_REFLECT_LIST = "reflectList"; + public static final String ATTR_USER_UID = "userUid"; public static final String DEFUALT_PROTOCOL_REFIX = "http://"; + public static final String ALLOW_PROTOCOL_REFIX = new String("[http://|https://|ftp://|nntp://]"); + + public static final String EVENT_NAME_NOTIFY_TEACHERS_ON_ASSIGMENT_SUBMIT = "notify_teachers_on_assigment_submit"; } Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.hbm.xml =================================================================== diff -u -red04e2e75728d635ec5c4530bcebe69ab32d9cdb -r05ab55ef4acdc0c374af7405c58fb0e0fe8eb6b7 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.hbm.xml (.../Resource.hbm.xml) (revision ed04e2e75728d635ec5c4530bcebe69ab32d9cdb) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.hbm.xml (.../Resource.hbm.xml) (revision 05ab55ef4acdc0c374af7405c58fb0e0fe8eb6b7) @@ -212,6 +212,14 @@ column="reflect_on_activity" /> + +