Index: lams_common/db/sql/insert_test_data.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_common/db/sql/Attic/insert_test_data.sql,v
diff -u -r1.45 -r1.46
--- lams_common/db/sql/insert_test_data.sql	21 Jun 2005 22:46:15 -0000	1.45
+++ lams_common/db/sql/insert_test_data.sql	21 Aug 2005 23:47:24 -0000	1.46
@@ -48,21 +48,34 @@
 INSERT INTO lams_user_organisation_role VALUES (17, 9, 3);
 INSERT INTO lams_user_organisation_role VALUES (18, 10,3);
 
-INSERT INTO lams_user VALUES(1, 'sysadmin','sysadmin','Mr','Fei','Yang',null,null,null,'Sydney','NSW','Australia',null,null,null,null,'fyang@melcoe.mq.edu.au',0,NOW(),1,null,1);
-INSERT INTO lams_user VALUES(2, 'test','test','Mr','Kevin','Han',null,null,null,'Sydney','NSW','Australia',null,null,null,null,'khan@melcoe.mq.edu.au',0,NOW(),3,null,2);
-INSERT INTO lams_user VALUES(3, 'lamskh01','dummy','Mr','Jacky','Fang',null,null,null,'Sydney','NSW','Australia',null,null,null,null,'jfang@melcoe.mq.edu.au',0,NOW(),2,null,3);
+-- themes and styles 
+INSERT INTO lams_css_style (style_id, theme_ve_id) VALUES (1,1);
+INSERT INTO lams_css_property (property_id, style_id, name, value, style_subset, type) VALUES (1, 1, "borderStyle", "outset", NULL, 1);
+INSERT INTO lams_css_property (property_id, style_id, name, value, style_subset, type) VALUES (2, 1, "color", "12452097", "_tf", 3);
+INSERT INTO lams_css_property (property_id, style_id, name, value, style_subset, type) VALUES (3, 1, "rollOverColor", "16711680", NULL, 2);
 
+INSERT INTO lams_css_style (style_id,theme_ve_id) VALUES (2,2);
+INSERT INTO lams_css_property (property_id, style_id, name, value, style_subset, type) VALUES (4, 2, "display", "block", "_tf", 1);
+INSERT INTO lams_css_property (property_id, style_id, name, value, style_subset, type) VALUES (5, 2, "selectionColor", "16711681", NULL, 3);
+
+INSERT INTO lams_css_theme_ve (theme_ve_id, name, description, parent_id, theme_flag) VALUES (1, "ruby", "cut down ruby theme for testing", null, 1);
+INSERT INTO lams_css_theme_ve (theme_ve_id, name, description, parent_id, theme_flag) VALUES (2, "button", null, 1, 0);
+
+-- users
+INSERT INTO lams_user VALUES(1, 'sysadmin','sysadmin','Mr','Fei','Yang',null,null,null,'Sydney','NSW','Australia',null,null,null,null,'fyang@melcoe.mq.edu.au',0,NOW(),1,null,1,'en','au',1);
+INSERT INTO lams_user VALUES(2, 'test','test','Mr','Kevin','Han',null,null,null,'Sydney','NSW','Australia',null,null,null,null,'khan@melcoe.mq.edu.au',0,NOW(),3,null,2,'mi','nz',1);
+INSERT INTO lams_user VALUES(3, 'lamskh01','dummy','Mr','Jacky','Fang',null,null,null,'Sydney','NSW','Australia',null,null,null,null,'jfang@melcoe.mq.edu.au',0,NOW(),2,null,3,'en','nz',1);
+
 insert into lams_user (user_id,login,password,title,first_name,last_name,address_line_1,address_line_2,address_line_3,
 city,state,country,day_phone,evening_phone,mobile_phone,
 fax,email,
 disabled_flag,create_date,authentication_method_id,workspace_id,
 base_organisation_id)
 values
-(4,'mminhas','mminhas','Ms','Manpreet','Minhas','170-22','Great Western Highway',null,
-'Parramatta','NSW','Australia','029509061','0298938052','0405651097',
-'0209509062','mminhas@melcoe.mq.edu.au',
-0,'20041223',1,6,
-4);
+(4,'mmmmmmm','mmmmmmm','Ms','Mary','Morgan','99','First Ave',null,
+'Parramatta','NSW','Australia','0295099999','0298939999','0499999999',
+'0299999999','mmmmmmm@xx.os',
+0,'20041223',1,6,4);
 
 insert into lams_workspace_folder (workspace_folder_id,parent_folder_id,name,workspace_id,user_id,create_date_time,last_modified_date_time,lams_workspace_folder_type_id)
 values(1,null,'ROOT',1,1,'20041223','20041223',1);
@@ -125,105 +138,105 @@
 
 -- Populates the lams_tool table with default tools corresponding to each of the above libraries
 
-insert into lams_tool (tool_id,tool_signature,service_name,tool_display_name,description,default_tool_content_id,
+insert into lams_tool (tool_id,tool_signature,service_name,tool_display_name,description,tool_identifier,tool_version,default_tool_content_id,
 grouping_support_type_id,supports_define_later_flag,supports_run_offline_flag,supports_moderation_flag,supports_contribute_flag,
 learner_url,author_url,define_later_url,export_portfolio_url,monitor_url,contribute_url,moderation_url,
 valid_flag,learning_library_id)
-values(1,'notebook_signature','notebookService','Notebook','Notebook Description',1,
+values(1,'notebook_signature','notebookService','Notebook','Notebook Description','notebook','1.1',1,
 2,0,1,0,1,
 'learner_url','author_url','define_later_url','export_portfolio_url','monitor_url','contribute_url','moderation_url',
 1,1);
 
-insert into lams_tool (tool_id,tool_signature,service_name,tool_display_name,description,default_tool_content_id,
+insert into lams_tool (tool_id,tool_signature,service_name,tool_display_name,description,tool_identifier,tool_version,default_tool_content_id,
 grouping_support_type_id,supports_define_later_flag,supports_run_offline_flag,supports_moderation_flag,supports_contribute_flag,
 learner_url,author_url,define_later_url,export_portfolio_url,monitor_url,contribute_url,moderation_url,
 valid_flag,learning_library_id)
-values(2,'noticeboard_signature','noticeboardService','Noticeboard','Noticeboard Description',2,
+values(2,'noticeboard_signature','noticeboardService','Noticeboard','Noticeboard Description','noticeboard','1.1',2,
 2,1,1,0,1,
 'learner_url','author_url','define_later_url','export_portfolio_url','monitor_url','contribute_url','moderation_url',
 1,2);
 
-insert into lams_tool (tool_id,tool_signature,service_name,tool_display_name,description,default_tool_content_id,
+insert into lams_tool (tool_id,tool_signature,service_name,tool_display_name,description,tool_identifier,tool_version,default_tool_content_id,
 grouping_support_type_id,supports_define_later_flag,supports_run_offline_flag,supports_moderation_flag,supports_contribute_flag,
 learner_url,author_url,define_later_url,export_portfolio_url,monitor_url,contribute_url,moderation_url,
 valid_flag,learning_library_id)
-values(3,'multiple_choice_signature','multipleChoiceService','Multiple Choice','Multiple Coice Description',3,
+values(3,'multiple_choice_signature','multipleChoiceService','Multiple Choice','Multiple Coice Description','multiple choice','1.1',3,
 2,1,1,1,1,
 'learner_url','author_url','define_later_url','export_portfolio_url','monitor_url','contribute_url','moderation_url',
 1,3);
 
-insert into lams_tool (tool_id,tool_signature,service_name,tool_display_name,description,default_tool_content_id,
+insert into lams_tool (tool_id,tool_signature,service_name,tool_display_name,description,tool_identifier,tool_version,default_tool_content_id,
 grouping_support_type_id,supports_define_later_flag,supports_run_offline_flag,supports_moderation_flag,supports_contribute_flag,
 learner_url,author_url,define_later_url,export_portfolio_url,monitor_url,contribute_url,moderation_url,
 valid_flag,learning_library_id)
-values(4,'question_answer_signature','questionAnswerService','Question and Answers','Question and Answers Description',4,
+values(4,'question_answer_signature','questionAnswerService','Question and Answers','Question and Answers Description','q & a','1.1',4,
 2,1,1,1,1,
 'learner_url','author_url','define_later_url','export_portfolio_url','monitor_url','contribute_url','moderation_url',
 1,4);
 
-insert into lams_tool (tool_id,tool_signature,service_name,tool_display_name,description,default_tool_content_id,
+insert into lams_tool (tool_id,tool_signature,service_name,tool_display_name,description,tool_identifier,tool_version,default_tool_content_id,
 grouping_support_type_id,supports_define_later_flag,supports_run_offline_flag,supports_moderation_flag,supports_contribute_flag,
 learner_url,author_url,define_later_url,export_portfolio_url,monitor_url,contribute_url,moderation_url,
 valid_flag,learning_library_id)
-values(5,'message_board_signature','messageBoardService','Message Board','Message Board Description',5,
+values(5,'message_board_signature','messageBoardService','Message Board','Message Board Description','forum','1.1',5,
 2,1,1,1,1,
 'learner_url','author_url','define_later_url','export_portfolio_url','monitor_url','contribute_url','moderation_url',
 1,5);
 
-insert into lams_tool (tool_id,tool_signature,service_name,tool_display_name,description,default_tool_content_id,
+insert into lams_tool (tool_id,tool_signature,service_name,tool_display_name,description,tool_identifier,tool_version,default_tool_content_id,
 grouping_support_type_id,supports_define_later_flag,supports_run_offline_flag,supports_moderation_flag,supports_contribute_flag,
 learner_url,author_url,define_later_url,export_portfolio_url,monitor_url,contribute_url,moderation_url,
 valid_flag,learning_library_id)
-values(6,'survey_signature','surveyService','Survey','Survey Description',6,
+values(6,'survey_signature','surveyService','Survey','Survey Description','survey','1.1',6,
 2,1,1,1,1,
 '/lams_tool_survey/tool/survey/survey.do?method=loadQuestionnaire','/lams_tool_survey/tool/survey/authoring.do?method=loadSurvey','define_later_url','export_portfolio_url',
 '/lams_tool_survey/tool/survey/report.do?method=loadMonitorReport','contribute_url','moderation_url',
 1,6);
 
-insert into lams_tool (tool_id,tool_signature,service_name,tool_display_name,description,default_tool_content_id,
+insert into lams_tool (tool_id,tool_signature,service_name,tool_display_name,description,tool_identifier,tool_version,default_tool_content_id,
 grouping_support_type_id,supports_define_later_flag,supports_run_offline_flag,supports_moderation_flag,supports_contribute_flag,
 learner_url,author_url,define_later_url,export_portfolio_url,monitor_url,contribute_url,moderation_url,
 valid_flag,learning_library_id)
-values(7,'chat_signature','chatService','Chat','Chat Description',7,
+values(7,'chat_signature','chatService','Chat','Chat Description','chat','1.1',7,
 2,1,1,1,1,
 'learner_url','author_url','define_later_url','export_portfolio_url','monitor_url','contribute_url','moderation_url',
 1,7);
 
-insert into lams_tool (tool_id,tool_signature,service_name,tool_display_name,description,default_tool_content_id,
+insert into lams_tool (tool_id,tool_signature,service_name,tool_display_name,description,tool_identifier,tool_version,default_tool_content_id,
 grouping_support_type_id,supports_define_later_flag,supports_run_offline_flag,supports_moderation_flag,supports_contribute_flag,
 learner_url,author_url,define_later_url,export_portfolio_url,monitor_url,contribute_url,moderation_url,
 valid_flag,learning_library_id)
-values(8,'shared_resources_signature','sharedResourcesService','Shared Resources','Shared Resources Description',8,
+values(8,'shared_resources_signature','sharedResourcesService','Shared Resources','Shared Resources Description','shared resources','1.1',8,
 2,1,0,1,1,
 'learner_url','author_url','define_later_url','export_portfolio_url','monitor_url','contribute_url','moderation_url',
 1,8);
 
 
-insert into lams_tool (tool_id,tool_signature,service_name,tool_display_name,description,default_tool_content_id,
+insert into lams_tool (tool_id,tool_signature,service_name,tool_display_name,description,tool_identifier,tool_version,default_tool_content_id,
 grouping_support_type_id,supports_define_later_flag,supports_run_offline_flag,supports_moderation_flag,supports_contribute_flag,
 learner_url,author_url,define_later_url,export_portfolio_url,monitor_url,contribute_url,moderation_url,
 valid_flag,learning_library_id)
-values(9,'voting_signature','votingService','Voting','Voting Description',9,
+values(9,'voting_signature','votingService','Voting','Voting Description','voting','1.1',9,
 2,1,1,1,1,
 'learner_url','author_url','define_later_url','export_portfolio_url','monitor_url','contribute_url','moderation_url',
 1,9);
 
 
-insert into lams_tool (tool_id,tool_signature,service_name,tool_display_name,description,default_tool_content_id,
+insert into lams_tool (tool_id,tool_signature,service_name,tool_display_name,description,tool_identifier,tool_version,default_tool_content_id,
 grouping_support_type_id,supports_define_later_flag,supports_run_offline_flag,supports_moderation_flag,supports_contribute_flag,
 learner_url,author_url,define_later_url,export_portfolio_url,monitor_url,contribute_url,moderation_url,
 valid_flag,learning_library_id)
-values(10,'submit_files_signature','submitFilesService','Submit Files','Submit Files Description',10,
+values(10,'submit_files_signature','submitFilesService','Submit Files','Submit Files Description','submit files','1.1',10,
 2,1,1,1,1,
 'learner_url','author_url','define_later_url','export_portfolio_url','monitor_url','contribute_url','moderation_url',
 1,10);
 
 
-insert into lams_tool (tool_id,tool_signature,service_name,tool_display_name,description,default_tool_content_id,
+insert into lams_tool (tool_id,tool_signature,service_name,tool_display_name,description,tool_identifier,tool_version,default_tool_content_id,
 grouping_support_type_id,supports_define_later_flag,supports_run_offline_flag,supports_moderation_flag,supports_contribute_flag,
 learner_url,author_url,define_later_url,export_portfolio_url,monitor_url,contribute_url,moderation_url,
 valid_flag,learning_library_id)
-values(11,'instant_messaging_signature','instantMessagingService','Instant Messaging','Instant Messaging Description',11,
+values(11,'instant_messaging_signature','instantMessagingService','Instant Messaging','Instant Messaging Description','instant messaging','1.1',11,
 2,1,1,1,1,
 'learner_url','author_url','define_later_url','export_portfolio_url','monitor_url','contribute_url','moderation_url',
 1,11);
@@ -280,292 +293,292 @@
 
 insert into lams_learning_activity (activity_id,activity_ui_id,description,title,xcoord,ycoord,parent_activity_id,help_text,
 learning_activity_type_id,grouping_id,order_id,define_later_flag,
-learning_design_id,learning_library_id,create_date_time,offline_instructions,run_offline_flag,
+learning_design_id,learning_library_id,create_date_time,run_offline_flag,
 max_number_of_options,min_number_of_options,tool_id,tool_content_id,
 gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image,
-grouping_support_type_id, apply_grouping_flag,online_instructions,activity_category_id)
+grouping_support_type_id, apply_grouping_flag,activity_category_id)
 values
 (1,1,'Notebook Template','Notebook',10,20,null,'Help Text for Activity',
 1,null,0,0,
-null,1,'20050101','Offline Instructions ',0,
+null,1,'20050101',0,
 null,null,1,1,
 null,null,null,'/lams/images/icon_journal.swf',
-1,0,'Online Instructions',1);
+1,0,1);
 
 insert into lams_learning_activity (activity_id,activity_ui_id,description,title,xcoord,ycoord,parent_activity_id,help_text,
 learning_activity_type_id,grouping_id,order_id,define_later_flag,
-learning_design_id,learning_library_id,create_date_time,offline_instructions,run_offline_flag,
+learning_design_id,learning_library_id,create_date_time,run_offline_flag,
 max_number_of_options,min_number_of_options,tool_id,tool_content_id,
 gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image,
-grouping_support_type_id, apply_grouping_flag,online_instructions,activity_category_id)
+grouping_support_type_id, apply_grouping_flag,activity_category_id)
 values
 (2,2,'NoticeBoard Template','NoticeBoard',10,20,null,'Help Text for Activity',
 1,null,0,0,
-null,2,'20050101','Offline  Instructions ',0,
+null,2,'20050101',0,
 null,null,2,2,
 null,null,null,'/lams/images/icon_noticeboard.swf',
-1,0,'Online Instructions',1);
+1,0,1);
 
 insert into lams_learning_activity (activity_id,activity_ui_id,description,title,xcoord,ycoord,parent_activity_id,help_text,
 learning_activity_type_id,grouping_id,order_id,define_later_flag,
-learning_design_id,learning_library_id,create_date_time,offline_instructions,run_offline_flag,
+learning_design_id,learning_library_id,create_date_time,run_offline_flag,
 max_number_of_options,min_number_of_options,tool_id,tool_content_id,
 gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image,
-grouping_support_type_id, apply_grouping_flag,online_instructions,activity_category_id)
+grouping_support_type_id, apply_grouping_flag,activity_category_id)
 values
 (3,3,'Multiple Choice Template','Multiple Choice',10,20,null,'Help Text for Activity',
 1,null,0,0,
-null,3,'20050101','Offline  Instructions ',0,
+null,3,'20050101',0,
 null,null,3,3,
 null,null,null,'missing.swf',
-1,0,'Online Instructions',1);
+1,0,1);
 
 insert into lams_learning_activity (activity_id,activity_ui_id,description,title,xcoord,ycoord,parent_activity_id,help_text,
 learning_activity_type_id,grouping_id,order_id,define_later_flag,
-learning_design_id,learning_library_id,create_date_time,offline_instructions,run_offline_flag,
+learning_design_id,learning_library_id,create_date_time,run_offline_flag,
 max_number_of_options,min_number_of_options,tool_id,tool_content_id,
 gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image,
-grouping_support_type_id, apply_grouping_flag,online_instructions,activity_category_id)
+grouping_support_type_id, apply_grouping_flag,activity_category_id)
 values
 (4,4,'Question and Answer Template','Question and Answer',10,20,null,'Help Text for Activity',
 1,null,0,0,
-null,4,'20050101','Offline  Instructions ',0,
+null,4,'20050101',0,
 null,null,4,4,
 null,null,null,'/lams/tool/laqa/images/icon_questionanswer.swf',
-1,0,'Online Instructions',1);
+1,0,1);
 
 insert into lams_learning_activity (activity_id,activity_ui_id,description,title,xcoord,ycoord,parent_activity_id,help_text,
 learning_activity_type_id,grouping_id,order_id,define_later_flag,
-learning_design_id,learning_library_id,create_date_time,offline_instructions,run_offline_flag,
+learning_design_id,learning_library_id,create_date_time,run_offline_flag,
 max_number_of_options,min_number_of_options,tool_id,tool_content_id,
 gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image,
-grouping_support_type_id, apply_grouping_flag,online_instructions,activity_category_id)
+grouping_support_type_id, apply_grouping_flag,activity_category_id)
 values
 (5,5,'MessageBoard Template','MessageBoard',10,20,null,'Help Text for Activity',
 1,null,0,0,
-null,5,'20050101','Offline  Instructions ',0,
+null,5,'20050101',0,
 null,null,5,5,
 null,null,null,'/lams/images/icon_messageboard.swf',
-1,0,'Online Instructions',1);
+1,0,1);
 
 insert into lams_learning_activity (activity_id,activity_ui_id,description,title,xcoord,ycoord,parent_activity_id,help_text,
 learning_activity_type_id,grouping_id,order_id,define_later_flag,
-learning_design_id,learning_library_id,create_date_time,offline_instructions,run_offline_flag,
+learning_design_id,learning_library_id,create_date_time,run_offline_flag,
 max_number_of_options,min_number_of_options,tool_id,tool_content_id,
 gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image,
-grouping_support_type_id, apply_grouping_flag,online_instructions,activity_category_id)
+grouping_support_type_id, apply_grouping_flag,activity_category_id)
 values
 (6,6,'Survey Template','Survey',10,20,null,'Help Text for Activity',
 1,null,0,0,
-null,6,'20050101','Offline  Instructions ',0,
+null,6,'20050101',0,
 null,null,6,6,
 null,null,null,'/lams/images/icon_survey.swf',
-1,0,'Online Instructions',1);
+1,0,1);
 
 insert into lams_learning_activity (activity_id,activity_ui_id,description,title,xcoord,ycoord,parent_activity_id,help_text,
 learning_activity_type_id,grouping_id,order_id,define_later_flag,
-learning_design_id,learning_library_id,create_date_time,offline_instructions,run_offline_flag,
+learning_design_id,learning_library_id,create_date_time,run_offline_flag,
 max_number_of_options,min_number_of_options,tool_id,tool_content_id,
 gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image,
-grouping_support_type_id, apply_grouping_flag,online_instructions,activity_category_id)
+grouping_support_type_id, apply_grouping_flag,activity_category_id)
 values
 (7,7,'Chat Template','Chat',10,20,null,'Help Text for Activity',
 1,null,0,0,
-null,7,'20050101','Offline  Instructions ',0,
+null,7,'20050101',0,
 null,null,7,7,
 null,null,null,'/lams/images/icon_chat.swf',
-1,0,'Online Instructions',1);
+1,0,1);
 
 insert into lams_learning_activity (activity_id,activity_ui_id,description,title,xcoord,ycoord,parent_activity_id,help_text,
 learning_activity_type_id,grouping_id,order_id,define_later_flag,
-learning_design_id,learning_library_id,create_date_time,offline_instructions,run_offline_flag,
+learning_design_id,learning_library_id,create_date_time,run_offline_flag,
 max_number_of_options,min_number_of_options,tool_id,tool_content_id,
 gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image,
-grouping_support_type_id, apply_grouping_flag,online_instructions,activity_category_id)
+grouping_support_type_id, apply_grouping_flag,activity_category_id)
 values
 (8,8,'Shared Resources Template','Shared Resources',10,20,null,'Help Text for Activity',
 1,null,0,0,
-null,8,'20050101','Offline  Instructions ',0,
+null,8,'20050101',0,
 null,null,8,8,
 null,null,null,'/lams/images/icon_singleresource.swf',
-1,0,'Online Instructions',1);
+1,0,1);
 
 insert into lams_learning_activity (activity_id,activity_ui_id,description,title,xcoord,ycoord,parent_activity_id,help_text,
 learning_activity_type_id,grouping_id,order_id,define_later_flag,
-learning_design_id,learning_library_id,create_date_time,offline_instructions,run_offline_flag,
+learning_design_id,learning_library_id,create_date_time,run_offline_flag,
 max_number_of_options,min_number_of_options,tool_id,tool_content_id,
 gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image,
-grouping_support_type_id, apply_grouping_flag,online_instructions,activity_category_id)
+grouping_support_type_id, apply_grouping_flag,activity_category_id)
 values
 (9,9,'Voting Template','Voting',10,20,null,'Help Text for Activity',
 1,null,0,0,
-null,9,'20050101','Offline  Instructions ',0,
+null,9,'20050101',0,
 null,null,9,9,
 null,null,null,'/lams/images/icon_ranking.swf',
-1,0,'Online Instructions',1);
+1,0,1);
 
 insert into lams_learning_activity (activity_id,activity_ui_id,description,title,xcoord,ycoord,parent_activity_id,help_text,
 learning_activity_type_id,grouping_id,order_id,define_later_flag,
-learning_design_id,learning_library_id,create_date_time,offline_instructions,run_offline_flag,
+learning_design_id,learning_library_id,create_date_time,run_offline_flag,
 max_number_of_options,min_number_of_options,tool_id,tool_content_id,
 gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image,
-grouping_support_type_id, apply_grouping_flag,online_instructions,activity_category_id)
+grouping_support_type_id, apply_grouping_flag,activity_category_id)
 values
 (10,10,'Submit Files Template','Submit Files',10,20,null,'Help Text for Activity',
 1,null,0,0,
-null,10,'20050101','Offline  Instructions ',0,
+null,10,'20050101',0,
 null,null,10,10,
 null,null,null,'/lams/images/icon_reportsubmission.swf',
-1,0,'Online Instructions',1);
+1,0,1);
 
 insert into lams_learning_activity (activity_id,activity_ui_id,description,title,xcoord,ycoord,parent_activity_id,help_text,
 learning_activity_type_id,grouping_id,order_id,define_later_flag,
-learning_design_id,learning_library_id,create_date_time,offline_instructions,run_offline_flag,
+learning_design_id,learning_library_id,create_date_time,run_offline_flag,
 max_number_of_options,min_number_of_options,tool_id,tool_content_id,
 gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image,
-grouping_support_type_id, apply_grouping_flag,online_instructions,activity_category_id)
+grouping_support_type_id, apply_grouping_flag,activity_category_id)
 values
 (11,11,'Instant Messaging Template','Instant Messaging',10,20,null,'Help Text for Activity',
 1,null,0,0,
-null,11,'20050101','Offline  Instructions ',0,
+null,11,'20050101',0,
 null,null,11,11,
 null,null,null,'missing.swf',
-1,0,'Online Instructions',1);
+1,0,1);
 
 insert into lams_learning_activity
 (activity_id,activity_ui_id,description,title,xcoord,ycoord,parent_activity_id,help_text,
 learning_activity_type_id,grouping_id,order_id,define_later_flag,
-learning_design_id,learning_library_id,create_date_time,offline_instructions,run_offline_flag,
+learning_design_id,learning_library_id,create_date_time,run_offline_flag,
 max_number_of_options,min_number_of_options,tool_id,tool_content_id,
 gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image,
-grouping_support_type_id, apply_grouping_flag,online_instructions,activity_category_id)
+grouping_support_type_id, apply_grouping_flag,activity_category_id)
 values
 (12,12,'Optional Activity Description','Optional Activity Title',10,20,null,'Help Text for Activity',
 7,null,1,0,
-1,null,'20050101','Offline Instructions ',0,
+1,null,'20050101',0,
 1,1,null,null,
 null,'20050101','20050101','missing.swf',
-3,1,'Online Instructions',1);
+3,1,1);
 
 insert into lams_learning_activity
 (activity_id,activity_ui_id,description,title,xcoord,ycoord,parent_activity_id,help_text,
 learning_activity_type_id,grouping_id,order_id,define_later_flag,
-learning_design_id,learning_library_id,create_date_time,offline_instructions,run_offline_flag,
+learning_design_id,learning_library_id,create_date_time,run_offline_flag,
 max_number_of_options,min_number_of_options,tool_id,tool_content_id,
 gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image,
-grouping_support_type_id, apply_grouping_flag,online_instructions,activity_category_id)
+grouping_support_type_id, apply_grouping_flag,activity_category_id)
 values
 (13,13,'Parallel Activity Description','Parallel Activity Title',10,20,null,'Help Text for Activity',
 6,null,1,0,
-1,null,'20050101','Parallel Activity Offline  Instructions ',0,
+1,null,'20050101',0,
 null,null,null,null,
 null,null,null,'missing.swf',
-1,0,'Online Instructions',1);
+1,0,1);
 
 insert into lams_learning_activity
 (activity_id,activity_ui_id,description,title,xcoord,ycoord,parent_activity_id,help_text,
 learning_activity_type_id,grouping_id,order_id,define_later_flag,
-learning_design_id,learning_library_id,create_date_time,offline_instructions,run_offline_flag,
+learning_design_id,learning_library_id,create_date_time,run_offline_flag,
 max_number_of_options,min_number_of_options,tool_id,tool_content_id,
 gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image,
-grouping_support_type_id, apply_grouping_flag,online_instructions,activity_category_id)
+grouping_support_type_id, apply_grouping_flag,activity_category_id)
 values
 (14,14,'Sequence Activity Description','Sequence Activity Title',10,20,null,'Help Text for Activity',
 8,null,1,0,
-1,null,'20050101','Sequence Activity Offline  Instructions ',0,
+1,null,'20050101',0,
 null,null,null,null,
 null,null,null,'missing.swf',
-1,0,'Online Instructions',1);
+1,0,1);
 
 insert into lams_learning_activity
 (activity_id,activity_ui_id,description,title,xcoord,ycoord,parent_activity_id,help_text,
 learning_activity_type_id,grouping_id,order_id,define_later_flag,
-learning_design_id,learning_library_id,create_date_time,offline_instructions,run_offline_flag,
+learning_design_id,learning_library_id,create_date_time,run_offline_flag,
 max_number_of_options,min_number_of_options,tool_id,tool_content_id,
 gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image,
-grouping_support_type_id, apply_grouping_flag,online_instructions,activity_category_id)
+grouping_support_type_id, apply_grouping_flag,activity_category_id)
 values
 (15,1,'Notebook Activity Description','Notebook Activity Title',10,20,null,'Help Text for Activity',
 1,null,1,0,
-1,1,'20050101','Notebook Activity Offline  Instructions ',0,
+1,1,'20050101',0,
 null,null,1,12,
 null,null,null,'/lams/images/icon_journal.swf',
-1,0,'Online Instructions',1);
+1,0,1);
 
 insert into lams_learning_activity
 (activity_id,activity_ui_id,description,title,xcoord,ycoord,parent_activity_id,help_text,
 learning_activity_type_id,grouping_id,order_id,define_later_flag,
-learning_design_id,learning_library_id,create_date_time,offline_instructions,run_offline_flag,
+learning_design_id,learning_library_id,create_date_time,run_offline_flag,
 max_number_of_options,min_number_of_options,tool_id,tool_content_id,
 gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image,
-grouping_support_type_id, apply_grouping_flag,online_instructions,activity_category_id)
+grouping_support_type_id, apply_grouping_flag,activity_category_id)
 values
 (16,2,'NoticeBoard Activity','NoticeBoard Activity',10,20,12,'Help Text for Activity',
 1,null,0,0,
-1,2,'20050101','NoticeBoard Activity Offline  Instructions ',0,
+1,2,'20050101',0,
 null,null,2,13,
 null,null,null,'/lams/images/icon_noticeboard.swf',
-1,0,'Online Instructions',1);
+1,0,1);
 
 insert into lams_learning_activity
 (activity_id,activity_ui_id,description,title,xcoord,ycoord,parent_activity_id,help_text,
 learning_activity_type_id,grouping_id,order_id,define_later_flag,
-learning_design_id,learning_library_id,create_date_time,offline_instructions,run_offline_flag,
+learning_design_id,learning_library_id,create_date_time,run_offline_flag,
 max_number_of_options,min_number_of_options,tool_id,tool_content_id,
 gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image,
-grouping_support_type_id, apply_grouping_flag,online_instructions,activity_category_id)
+grouping_support_type_id, apply_grouping_flag,activity_category_id)
 values
 (17,3,'Multiple Choice Activity ','Multiple Choice',10,20,12,'Help Text for Activity',
 1,null,1,0,
-1,3,'20050101','Tool Activity Offline  Instructions ',0,
+1,3,'20050101',0,
 null,null,3,14,
 null,null,null,'missing.swf',
-1,0,'Online Instructions',1);
+1,0,1);
 
 insert into lams_learning_activity
 (activity_id,activity_ui_id,description,title,xcoord,ycoord,parent_activity_id,help_text,
 learning_activity_type_id,grouping_id,order_id,define_later_flag,
-learning_design_id,learning_library_id,create_date_time,offline_instructions,run_offline_flag,
+learning_design_id,learning_library_id,create_date_time,run_offline_flag,
 max_number_of_options,min_number_of_options,tool_id,tool_content_id,
 gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image,
-grouping_support_type_id, apply_grouping_flag,online_instructions,activity_category_id)
+grouping_support_type_id, apply_grouping_flag,activity_category_id)
 values
 (18,4,'Question and Answer Activity','Question and Answer',10,20,13,'Help Text for Activity',
 1,null,0,1,
-1,4,'20050101','Tool Activity Offline  Instructions ',0,
+1,4,'20050101',0,
 null,null,4,15,
 null,null,null,'/lams/tool/laqa/images/icon_questionanswer.swf',
-1,0,'Online Instructions',1);
+1,0,1);
 
 insert into lams_learning_activity
 (activity_id,activity_ui_id,description,title,xcoord,ycoord,parent_activity_id,help_text,
 learning_activity_type_id,grouping_id,order_id,define_later_flag,
-learning_design_id,learning_library_id,create_date_time,offline_instructions,run_offline_flag,
+learning_design_id,learning_library_id,create_date_time,run_offline_flag,
 max_number_of_options,min_number_of_options,tool_id,tool_content_id,
 gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image,
-grouping_support_type_id, apply_grouping_flag,online_instructions,activity_category_id)
+grouping_support_type_id, apply_grouping_flag,activity_category_id)
 values
 (19,5,'Message Board Activity','Message Board',10,20,13,'Help Text for Activity',
 1,100,1,0,
-1,5,'20050101','Tool Activity Offline  Instructions ',0,
+1,5,'20050101',0,
 null,null,5,16,
 null,null,null,'/lams/images/icon_messageboard.swf',
-1,0,'Online Instructions',1);
+1,0,1);
 
 insert into lams_learning_activity
 (activity_id,activity_ui_id,description,title,xcoord,ycoord,parent_activity_id,help_text,
 learning_activity_type_id,grouping_id,order_id,define_later_flag,
-learning_design_id,learning_library_id,create_date_time,offline_instructions,run_offline_flag,
+learning_design_id,learning_library_id,create_date_time,run_offline_flag,
 max_number_of_options,min_number_of_options,tool_id,tool_content_id,
 gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image,
-grouping_support_type_id, apply_grouping_flag,online_instructions,activity_category_id)
+grouping_support_type_id, apply_grouping_flag,activity_category_id)
 values
 (20,6,'Survey Activity','Survey Title',10,20,null,'Help Text for Activity',
 1,null,0,1,
-1,6,'20050101','Tool Activity Offline  Instructions ',0,
+1,6,'20050101',0,
 null,null,6,17,
 null,null,null,'/lams/images/icon_survey.swf',
-1,0,'Online Instructions',1);
+1,0,1);
 
 insert into lams_learning_activity
 (activity_id,activity_ui_id,
@@ -574,7 +587,7 @@
 parent_activity_id,parent_ui_id,learning_activity_type_id,
 grouping_id,grouping_ui_id,order_id,define_later_flag,
 learning_design_id,learning_library_id,create_date_time,
-run_offline_flag,offline_instructions,
+run_offline_flag,
 max_number_of_options,min_number_of_options,options_instructions,
 tool_id,tool_content_id,
 gate_activity_level_id,gate_open_flag,
@@ -583,15 +596,15 @@
 library_activity_ui_image,
 create_grouping_id,create_grouping_ui_id,
 library_activity_id,
-grouping_support_type_id, apply_grouping_flag,online_instructions,activity_category_id)
+grouping_support_type_id, apply_grouping_flag,activity_category_id)
 values
 (21,7,
 'Chat Activity Description','Chat Title','Help Text for Chat Activity',
 10,20,
 null,null,1,
 99,99,0,0,
 1,7,'20050101',
-1,'Tool Activity Offline  Instructions ',
+1,
 null,null,null,
 7,18,
 null,null,
@@ -600,22 +613,22 @@
 '/lams/images/icon_chat.swf',
 null,null,
 7,
-2,1,'Online Instructions',1);
+2,1,1);
 
 insert into lams_learning_activity
 (activity_id,activity_ui_id,description,title,xcoord,ycoord,parent_activity_id,help_text,
 learning_activity_type_id,grouping_id,order_id,define_later_flag,
-learning_design_id,learning_library_id,create_date_time,offline_instructions,run_offline_flag,
+learning_design_id,learning_library_id,create_date_time,run_offline_flag,
 max_number_of_options,min_number_of_options,tool_id,tool_content_id,
 gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image,
-grouping_support_type_id, apply_grouping_flag,online_instructions,activity_category_id)
+grouping_support_type_id, apply_grouping_flag,activity_category_id)
 values
 (22,8,'Shared Resources Activity','Shared Resources',10,20,14,'Help Text for Activity',
 1,null,0,0,
-1,8,'20050101','Tool Activity Offline  Instructions ',0,
+1,8,'20050101',0,
 null,null,8,19,
 null,null,null,'/lams/images/icon_singleresource.swf',
-1,0,'Online Instructions',1);
+1,0,1);
 
 -- Sample GroupingActivity with RandomGrouping 
 
@@ -626,7 +639,7 @@
 parent_activity_id,parent_ui_id,learning_activity_type_id,
 grouping_id,grouping_ui_id,order_id,define_later_flag,
 learning_design_id,learning_library_id,create_date_time,
-run_offline_flag,offline_instructions,
+run_offline_flag,
 max_number_of_options,min_number_of_options,options_instructions,
 tool_id,tool_content_id,
 gate_activity_level_id,gate_open_flag,
@@ -635,15 +648,15 @@
 library_activity_ui_image,
 create_grouping_id,create_grouping_ui_id,
 library_activity_id,
-grouping_support_type_id, apply_grouping_flag,online_instructions,activity_category_id)
+grouping_support_type_id, apply_grouping_flag,activity_category_id)
 values
 (23,23,
 'Random Grouping Activity Description','RandomGroupingActivity Title','Help Text for RandomGroupingActivity',
 10,20,
 null,null,2,
 null,null,0,0,
 1,null,'20050101',
-0,null,
+0,
 null,null,null,
 null,null,
 null,null,
@@ -652,7 +665,7 @@
 'missing.swf',
 99,99,
 null,
-1,0,'Online Instructions',1);
+1,0,1);
 
 insert into lams_learning_activity
 (activity_id,activity_ui_id,
@@ -661,7 +674,7 @@
 parent_activity_id,parent_ui_id,learning_activity_type_id,
 grouping_id,grouping_ui_id,order_id,define_later_flag,
 learning_design_id,learning_library_id,create_date_time,
-run_offline_flag,offline_instructions,
+run_offline_flag,
 max_number_of_options,min_number_of_options,options_instructions,
 tool_id,tool_content_id,
 gate_activity_level_id,gate_open_flag,
@@ -670,15 +683,15 @@
 library_activity_ui_image,
 create_grouping_id,create_grouping_ui_id,
 library_activity_id,
-grouping_support_type_id, apply_grouping_flag,online_instructions,activity_category_id)
+grouping_support_type_id, apply_grouping_flag,activity_category_id)
 values
 (24,24,
 'QNA Activity Description','QNA Activity Title','Help Text for QNA Activity',
 10,20,
 null,null,1,
 99,99,0,1,
 1,4,'20050101',
-1,'QNA Activity Offline  Instructions ',
+1,
 null,null,null,
 4,20,
 null,null,
@@ -687,7 +700,7 @@
 '/lams/tool/laqa/images/icon_questionanswer.swf',
 null,null,
 4,
-2,1,'Online Instructions',1);
+2,1,1);
 
 insert into lams_learning_activity
 (activity_id,activity_ui_id,
@@ -696,7 +709,7 @@
 parent_activity_id,parent_ui_id,learning_activity_type_id,
 grouping_id,grouping_ui_id,order_id,define_later_flag,
 learning_design_id,learning_library_id,create_date_time,
-run_offline_flag,offline_instructions,
+run_offline_flag,
 max_number_of_options,min_number_of_options,options_instructions,
 tool_id,tool_content_id,
 gate_activity_level_id,gate_open_flag,
@@ -705,15 +718,15 @@
 library_activity_ui_image,
 create_grouping_id,create_grouping_ui_id,
 library_activity_id,
-grouping_support_type_id, apply_grouping_flag,online_instructions,activity_category_id)
+grouping_support_type_id, apply_grouping_flag,activity_category_id)
 values
 (25,25,
 'QNA Activity Description','QNA Activity Title','Help Text for QNA Activity',
 10,20,
 14,14,1,
 null,null,1,1,
 1,4,'20050101',
-1,'QNA Activity Offline  Instructions ',
+1,
 null,null,null,
 4,21,
 null,null,
@@ -722,7 +735,7 @@
 '/lams/tool/laqa/images/icon_questionanswer.swf',
 null,null,
 4,
-1,0,'Online Instructions',1);
+1,0,1);
 
 
 
@@ -733,7 +746,7 @@
 parent_activity_id,parent_ui_id,learning_activity_type_id,
 grouping_id,grouping_ui_id,order_id,define_later_flag,
 learning_design_id,learning_library_id,create_date_time,
-run_offline_flag,offline_instructions,
+run_offline_flag,
 max_number_of_options,min_number_of_options,options_instructions,
 tool_id,tool_content_id,
 gate_activity_level_id,gate_open_flag,
@@ -742,15 +755,15 @@
 library_activity_ui_image,
 create_grouping_id,create_grouping_ui_id,
 library_activity_id,
-grouping_support_type_id, apply_grouping_flag,online_instructions,activity_category_id)
+grouping_support_type_id, apply_grouping_flag,activity_category_id)
 values
 (26,26,
 'Synch Gate','Synch Gate Activity','Help Text for Synch Gate',
 10,20,
 null,null,3,
 null,null,0,0,
 1,null,'20050101',
-0,null,
+0,
 null,null,null,
 null,null,
 3,0,
@@ -759,7 +772,7 @@
 'missing.swf',
 null,null,
 null,
-1,0,'Online Instructions',1);
+1,0,1);
 
 insert into lams_learning_activity
 (activity_id,activity_ui_id,
@@ -768,7 +781,7 @@
 parent_activity_id,parent_ui_id,learning_activity_type_id,
 grouping_id,grouping_ui_id,order_id,define_later_flag,
 learning_design_id,learning_library_id,create_date_time,
-run_offline_flag,offline_instructions,
+run_offline_flag,
 max_number_of_options,min_number_of_options,options_instructions,
 tool_id,tool_content_id,
 gate_activity_level_id,gate_open_flag,
@@ -777,15 +790,15 @@
 library_activity_ui_image,
 create_grouping_id,create_grouping_ui_id,
 library_activity_id,
-grouping_support_type_id, apply_grouping_flag,online_instructions,activity_category_id)
+grouping_support_type_id, apply_grouping_flag,activity_category_id)
 values
 (27,27,
 'Schedule Gate','Schedule Gate Activity','Help Text for Schedule Gate',
 10,20,
 null,null,4,
 null,null,0,0,
 1,null,'20050101',
-0,null,
+0,
 null,null,null,
 null,null,
 3,0,
@@ -794,7 +807,7 @@
 'missing.swf',
 null,null,
 null,
-1,0,'Online Instructions',1);
+1,0,1);
 
 insert into lams_learning_activity
 (activity_id,activity_ui_id,
@@ -803,7 +816,7 @@
 parent_activity_id,parent_ui_id,learning_activity_type_id,
 grouping_id,grouping_ui_id,order_id,define_later_flag,
 learning_design_id,learning_library_id,create_date_time,
-run_offline_flag,offline_instructions,
+run_offline_flag,
 max_number_of_options,min_number_of_options,options_instructions,
 tool_id,tool_content_id,
 gate_activity_level_id,gate_open_flag,
@@ -812,15 +825,15 @@
 library_activity_ui_image,
 create_grouping_id,create_grouping_ui_id,
 library_activity_id,
-grouping_support_type_id, apply_grouping_flag,online_instructions,activity_category_id)
+grouping_support_type_id, apply_grouping_flag,activity_category_id)
 values
 (28,28,
 'Permission Gate','Permission Gate Activity','Help Text for Permission Gate',
 10,20,
 null,null,5,
 null,null,0,0,
 1,null,'20050101',
-0,null,
+0,
 null,null,null,
 null,null,
 3,0,
@@ -829,7 +842,7 @@
 'missing.swf',
 null,null,
 null,
-1,0,'Online Instructions',1);
+1,0,1);
 
 -- Populates the lams_learning_transition table with various transitions for the dummy design 
 
@@ -887,10 +900,12 @@
 
 insert into lams_learning_design(learning_design_ui_id,description,title,first_activity_id,max_id,valid_design_flag,
 								 read_only_flag,user_id,help_text,copy_type_id,create_date_time,version,
-								 parent_learning_design_id,workspace_folder_id)
+								 parent_learning_design_id,workspace_folder_id,
+								 online_instructions,offline_instructions)
 								values
 								(1,'Test Learning Design','Test Learning Design title',20,1,1,0,1,
-								'Help Text',1,'20041223','1.0',null,2);		
+								'Help Text',1,'20041223','1.0',null,2,
+								'Online instructions', 'Offline instructions');		
 
 -- insert the test data for the content repository
 INSERT INTO lams_cr_credential (credential_id, name, password) VALUES (1, 'atool','atool');
