Index: lams_tool_larsrc/conf/language/ApplicationResources.properties =================================================================== diff -u -r7086ae4ff560703d2a2859eed9d3b4c25dfdc44e -rf44c4b85fd2563394f045ad28218d3c0b5cbb9da --- lams_tool_larsrc/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision 7086ae4ff560703d2a2859eed9d3b4c25dfdc44e) +++ lams_tool_larsrc/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision f44c4b85fd2563394f045ad28218d3c0b5cbb9da) @@ -97,7 +97,7 @@ error.msg.default.content.not.find=Could not retrieve default content record for this tool. authoring.save.success=Authoring save successfully. -msg.no.instruction=No instruction avalialbe. +msg.no.instruction=No instruction available. #-------------------------END Authoring Labels END-----------------# #------------------------------Learner ----------------------------------# label.learning.title=Shared Resource Learning Index: lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql =================================================================== diff -u -r1f1955db444fd1c243fe1904ee8cc1b48e30c8ff -rf44c4b85fd2563394f045ad28218d3c0b5cbb9da --- lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql (.../create_lams_tool_rsrc.sql) (revision 1f1955db444fd1c243fe1904ee8cc1b48e30c8ff) +++ lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql (.../create_lams_tool_rsrc.sql) (revision f44c4b85fd2563394f045ad28218d3c0b5cbb9da) @@ -29,18 +29,18 @@ update_date datetime, create_by bigint, title varchar(255), - run_offline bit, - lock_on_finished bit, + run_offline tinyint, + lock_on_finished tinyint, instructions text, online_instructions text, offline_instructions text, - content_in_use bit, - define_later bit, + content_in_use tinyint, + define_later tinyint, content_id bigint unique, - allow_add_files bit, - allow_add_urls bit, + allow_add_files tinyint, + allow_add_urls tinyint, mini_view_resource_number integer, - allow_auto_run bit, + allow_auto_run tinyint, primary key (uid) ); create table tl_larsrc11_resource_item ( @@ -55,8 +55,8 @@ url text, create_by bigint, create_date datetime, - create_by_author bit, - is_hide bit, + create_by_author tinyint, + is_hide tinyint, item_type smallint, file_type varchar(255), file_name varchar(255), @@ -69,7 +69,7 @@ access_date datetime, resource_item_uid bigint, user_uid bigint, - complete bit, + complete tinyint, session_id bigint, primary key (uid) ); @@ -106,5 +106,5 @@ 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,'LAMS Shared Resources','\0','\0','Instruction','Online instruction','Offline instruction',1,1,${default_content_id},1,1,1,1); + (2,NULL,NULL,NULL,'LAMS Shared Resources','0','0','Instruction','Online instruction','Offline instruction',1,1,${default_content_id},1,1,1,1); SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_larsrc/db/sql/table-schema.sql =================================================================== diff -u -r1f1955db444fd1c243fe1904ee8cc1b48e30c8ff -rf44c4b85fd2563394f045ad28218d3c0b5cbb9da --- lams_tool_larsrc/db/sql/table-schema.sql (.../table-schema.sql) (revision 1f1955db444fd1c243fe1904ee8cc1b48e30c8ff) +++ lams_tool_larsrc/db/sql/table-schema.sql (.../table-schema.sql) (revision f44c4b85fd2563394f045ad28218d3c0b5cbb9da) @@ -38,18 +38,18 @@ update_date datetime, create_by bigint, title varchar(255), - run_offline bit, + run_offline tinyint, lock_on_finished bit, instructions text, online_instructions text, offline_instructions text, - content_in_use bit, - define_later bit, + content_in_use tinyint, + define_later tinyint, content_id bigint unique, - allow_add_files bit, - allow_add_urls bit, + allow_add_files tinyint, + allow_add_urls tinyint, mini_view_resource_number integer, - allow_auto_run bit, + allow_auto_run tinyint, primary key (uid) ); create table tl_larsrc11_resource_item ( @@ -64,8 +64,8 @@ url text, create_by bigint, create_date datetime, - create_by_author bit, - is_hide bit, + create_by_author tinyint, + is_hide tinyint, item_type smallint, file_type varchar(255), file_name varchar(255), @@ -78,7 +78,7 @@ access_date datetime, resource_item_uid bigint, user_uid bigint, - complete bit, + complete tinyint, session_id bigint, primary key (uid) ); Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java =================================================================== diff -u -r2d5c816aea752e0deeed7bed796708da847247b8 -rf44c4b85fd2563394f045ad28218d3c0b5cbb9da --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java (.../LearningAction.java) (revision 2d5c816aea752e0deeed7bed796708da847247b8) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java (.../LearningAction.java) (revision f44c4b85fd2563394f045ad28218d3c0b5cbb9da) @@ -237,21 +237,26 @@ service.createUser(resourceUser); } - List items = null; + List items = null; Resource resource; try { items = service.getResourceItemsBySessionId(sessionId); - ResourceSession session = service.getResourceSessionBySessionId(sessionId); resource = service.getResourceBySessionId(sessionId); } catch (Exception e) { log.error(e); return mapping.findForward(ResourceConstants.ERROR); } //init resource item list - List resourceItemList = getResourceItemList(request); + List resourceItemList = getResourceItemList(request); resourceItemList.clear(); - if(items != null) - resourceItemList.addAll(items); + if(items != null){ + //remove hidden items. + for(ResourceItem item : items){ + if(!item.isHide()){ + resourceItemList.add(item); + } + } + } //set complete flag for display purpose service.retrieveComplete(resourceItemList, resourceUser); Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java =================================================================== diff -u -r1f1955db444fd1c243fe1904ee8cc1b48e30c8ff -rf44c4b85fd2563394f045ad28218d3c0b5cbb9da --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java (.../ViewItemAction.java) (revision 1f1955db444fd1c243fe1904ee8cc1b48e30c8ff) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java (.../ViewItemAction.java) (revision f44c4b85fd2563394f045ad28218d3c0b5cbb9da) @@ -106,7 +106,19 @@ if(item != null){ Set instructions = item.getItemInstructions(); InstructionNavForm navForm = (InstructionNavForm) form; - navForm.setAllInstructions(new ArrayList(instructions)); + //For Learner upload item, its instruction will display description/comment fields in ReosourceItem. + if(!item.isCreateByAuthor()){ + List navItems = new ArrayList(1); + //create a new instruction and put ResourceItem description into it: just for display use. + ResourceItemInstruction ins = new ResourceItemInstruction(); + ins.setSequenceId(1); + ins.setDescription(item.getDescription()); + navItems.add(ins); + navForm.setAllInstructions(navItems); + instructions.add(ins); + }else{ + navForm.setAllInstructions(new ArrayList(instructions)); + } navForm.setTitle(item.getTitle()); navForm.setType(item.getType()); navForm.setTotal(instructions.size()); Index: lams_tool_larsrc/web/includes/images/.cvsignore =================================================================== diff -u --- lams_tool_larsrc/web/includes/images/.cvsignore (revision 0) +++ lams_tool_larsrc/web/includes/images/.cvsignore (revision f44c4b85fd2563394f045ad28218d3c0b5cbb9da) @@ -0,0 +1 @@ +Thumbs.db Index: lams_tool_larsrc/web/includes/images/tick.gif =================================================================== diff -u Binary files differ Index: lams_tool_larsrc/web/pages/learning/learning.jsp =================================================================== diff -u -r2d5c816aea752e0deeed7bed796708da847247b8 -rf44c4b85fd2563394f045ad28218d3c0b5cbb9da --- lams_tool_larsrc/web/pages/learning/learning.jsp (.../learning.jsp) (revision 2d5c816aea752e0deeed7bed796708da847247b8) +++ lams_tool_larsrc/web/pages/learning/learning.jsp (.../learning.jsp) (revision f44c4b85fd2563394f045ad28218d3c0b5cbb9da) @@ -61,22 +61,22 @@ - + ${item.title} - + - +