Index: lams_common/db/sql/insert_test_data.sql
===================================================================
diff -u -r8bad300543fcb9835328a90421398ce890566880 -r97d943f25cdc91d8df66f94309c2781b790d4a56
--- lams_common/db/sql/insert_test_data.sql	(.../insert_test_data.sql)	(revision 8bad300543fcb9835328a90421398ce890566880)
+++ lams_common/db/sql/insert_test_data.sql	(.../insert_test_data.sql)	(revision 97d943f25cdc91d8df66f94309c2781b790d4a56)
@@ -1,21 +1,23 @@
 SET FOREIGN_KEY_CHECKS=0;
 
+insert into lams_workspace values(1,null,'Lams Workspace');
+insert into lams_workspace values(2,null,'Manpreet Minhas');
+insert into lams_workspace values(3,null,'Test Workspace');
+
 INSERT INTO lams_organisation VALUES (1, 'Root', 'Root Organisation',null,1,NOW(),null);
 INSERT INTO lams_organisation VALUES (2, 'Maquarie Uni', 'Macquarie University',1,2,NOW(),null);
 INSERT INTO lams_organisation VALUES (3, 'MELCOE', 'Macquarie E-learning Center',2,3,NOW(),null);
-INSERT INTO lams_organisation VALUES (4, 'LAMS', 'Lams Project Team',3,3,NOW(),null);
+INSERT INTO lams_organisation VALUES (4, 'LAMS', 'Lams Project Team',3,3,NOW(),1);
 INSERT INTO lams_organisation VALUES (5, 'MAMS', 'Mams Project Team',3,3,NOW(),null);
 
-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);
 
 INSERT INTO lams_user_organisation VALUES (1, 1, 1);
 INSERT INTO lams_user_organisation VALUES (2, 2, 2);
 INSERT INTO lams_user_organisation VALUES (3, 3, 2);
 INSERT INTO lams_user_organisation VALUES (4, 4, 2);
 INSERT INTO lams_user_organisation VALUES (5, 2, 3);
 INSERT INTO lams_user_organisation VALUES (6, 3, 3);
+INSERT INTO lams_user_organisation VALUES (7, 4, 4);
 
 INSERT INTO lams_user_organisation_role VALUES (1, 1, 1);
 INSERT INTO lams_user_organisation_role VALUES (2, 2, 2);
@@ -31,19 +33,100 @@
 INSERT INTO lams_user_organisation_role VALUES (12, 5, 4);
 INSERT INTO lams_user_organisation_role VALUES (13, 5, 5);
 INSERT INTO lams_user_organisation_role VALUES (14, 6, 3);
+INSERT INTO lams_user_organisation_role VALUES (15, 7, 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,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,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,3);
 
+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,user_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,2,
+4,7);
 
-insert into lams_workspace_folder 
-(parent_folder_id,name,workspace_id,
-user_id,create_date_time,last_modified_date_time,
-lams_workspace_folder_type_id)
- values
-(null,'Test Workspace',1,
-1,'20042312','20042312',
+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,'Lams Workspace',1,
+1,'20041223','20041223',
 1);
 
+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
+(2,1,'Manpreet Minhas Workspace',2,
+4,'20041223','20041223',
+1);
 
+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
+(3,2,'Manpreet Minhas Run Sequences Folder',2,
+4,'20041223','20041223',
+2);
+
+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
+(4,2,'MMinhas1',2,
+4,'20041223','20041223',
+1);
+
+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
+(5,2,'MMinhas2',2,
+4,'20041223','20041223',
+1);
+
+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
+(6,5,'Monu1',2,
+4,'20041223','20041223',
+1);
+
+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
+(7,5,'Monu2',2,
+4,'20041223','20041223',
+1);
+
+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
+(8,1,'Test Workspace',3,
+4,'20041223','20041223',
+1);
+
+update lams_workspace set root_folder_id = 1 where workspace_id = 1;
+update lams_workspace set root_folder_id = 2 where workspace_id = 2;
+update lams_workspace set root_folder_id = 8 where workspace_id = 3;
+
 -- Populates the lams_learning_library table with default libraries
 
 insert into lams_learning_library (learning_library_id,description,title,create_date_time) values (1,'Notebook','Notebook','20050207');
@@ -60,76 +143,165 @@
 
 -- 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,
+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,
+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,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,valid_flag,learning_library_id,create_date_time)
 values(1,'notebook_signature','notebookService','Notebook','Notebook Description',1,1,0,
 1,1,1,
 'learner_url','author_url','define_later_url','export_portfolio_url','monitor_url',1,1,'2005-02-25 17:37:25');
 
+insert into lams_tool (tool_id,tool_signature,service_name,tool_display_name,description,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,
+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,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,valid_flag,learning_library_id,create_date_time)
 values(2,'noticeboard_signature','noticeboardService','Noticeboard','Noticeboard Description',2,1,0,
 1,1,1,
 'learner_url','author_url','define_later_url','export_portfolio_url','monitor_url',1,2,'2005-02-25 17:37:25');
 
+insert into lams_tool (tool_id,tool_signature,service_name,tool_display_name,description,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,
+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,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,valid_flag,learning_library_id,create_date_time)
 values(3,'multiple_choice_signature','multipleChoiceService','Multiple Choice','Multiple Coice Description',3,3,0,
 1,1,1,
 'learner_url','author_url','define_later_url','export_portfolio_url','monitor_url',1,3,'2005-02-25 17:37:25');
 
+insert into lams_tool (tool_id,tool_signature,service_name,tool_display_name,description,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,
+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,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,valid_flag,learning_library_id,create_date_time)
 values(4,'question_answer_signature','questionAnswerService','Question and Answers','Question and Answers Description',4,3,0,
 1,1,1,
 'learner_url','author_url','define_later_url','export_portfolio_url','monitor_url',1,4,'2005-02-25 17:37:25');
 
+insert into lams_tool (tool_id,tool_signature,service_name,tool_display_name,description,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,
+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,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,valid_flag,learning_library_id,create_date_time)
 values(5,'message_board_signature','messageBoardService','Message Board','Message Board Description',5,3,0,
 1,1,1,
 'learner_url','author_url','define_later_url','export_portfolio_url','monitor_url',1,5,'2005-02-25 17:37:25');
 
+insert into lams_tool (tool_id,tool_signature,service_name,tool_display_name,description,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,
+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,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,valid_flag,learning_library_id,create_date_time)
 values(6,'survey_signature','surveyService','Survey','Survey Description',6,1,0,
 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',1,6,'2005-02-25 17:37:25');
 
+insert into lams_tool (tool_id,tool_signature,service_name,tool_display_name,description,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,
+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,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,valid_flag,learning_library_id,create_date_time)
 values(7,'chat_signature','chatService','Chat','Chat Description',7,3,0,
 1,1,1,
 'learner_url','author_url','define_later_url','export_portfolio_url','monitor_url',1,7,'2005-02-25 17:37:25');
 
+insert into lams_tool (tool_id,tool_signature,service_name,tool_display_name,description,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,
+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,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,valid_flag,learning_library_id,create_date_time)
 values(8,'shared_resources_signature','sharedResourcesService','Shared Resources','Shared Resources Description',8,3,0,
 1,1,1,
 'learner_url','author_url','define_later_url','export_portfolio_url','monitor_url',1,8,'2005-02-25 17:37:25');
 
+insert into lams_tool (tool_id,tool_signature,service_name,tool_display_name,description,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,
+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,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,valid_flag,learning_library_id,create_date_time)
 values(9,'voting_signature','votingService','Voting','Voting Description',9,3,0,
 1,1,1,
 'learner_url','author_url','define_later_url','export_portfolio_url','monitor_url',1,9,'2005-02-25 17:37:25');
 
+insert into lams_tool (tool_id,tool_signature,service_name,tool_display_name,description,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,
+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,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,valid_flag,learning_library_id,create_date_time)
 values(10,'submit_files_signature','submitFilesService','Submit Files','Submit Files Description',10,1,0,
 1,1,1,
 'learner_url','author_url','define_later_url','export_portfolio_url','monitor_url',1,10,'2005-02-25 17:37:25');
 
+insert into lams_tool (tool_id,tool_signature,service_name,tool_display_name,description,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,
+2,1,1,1,1,
+'learner_url','author_url','define_later_url','export_portfolio_url','monitor_url','contribute_url','moderation_url',
+1,11);
 insert into lams_tool (tool_id,tool_signature,service_name,tool_display_name,description,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,valid_flag,learning_library_id,create_date_time)
@@ -160,6 +332,11 @@
 insert into lams_tool_content (tool_content_id,tool_id) values (19,8);
 insert into lams_tool_content (tool_content_id,tool_id) values (20,4);
 insert into lams_tool_content (tool_content_id,tool_id) values (21,4);
+insert into lams_tool_content (tool_content_id,tool_id) values(22,4);
+insert into lams_tool_content (tool_content_id,tool_id) values(23,2);
+insert into lams_tool_content (tool_content_id,tool_id) values(24,7);
+insert into lams_tool_content (tool_content_id,tool_id) values(25,3);
+insert into lams_tool_content (tool_content_id,tool_id) values(26,6);
 
 --insert a testing grouping
 insert into lams_grouping values(99,99,1,2,-1,0,-1);
@@ -236,7 +413,7 @@
 null,4,'20050101','Offline  Instructions ',0,
 null,null,4,4,
 null,null,null,'QAImage',
-1,1,'Online Instructions',1);
+1,0,'Online Instructions',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,
@@ -250,7 +427,7 @@
 null,5,'20050101','Offline  Instructions ',0,
 null,null,5,5,
 null,null,null,'MBImage',
-1,1,'Online Instructions',1);
+1,0,'Online Instructions',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,
@@ -278,7 +455,7 @@
 null,7,'20050101','Offline  Instructions ',0,
 null,null,7,7,
 null,null,null,'ChatImage',
-1,1,'Online Instructions',1);
+1,0,'Online Instructions',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,
@@ -292,7 +469,7 @@
 null,8,'20050101','Offline  Instructions ',0,
 null,null,8,8,
 null,null,null,'SRImage',
-1,1,'Online Instructions',1);
+1,0,'Online Instructions',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,
@@ -306,7 +483,7 @@
 null,9,'20050101','Offline  Instructions ',0,
 null,null,9,9,
 null,null,null,'VotingImage',
-1,1,'Online Instructions',1);
+1,0,'Online Instructions',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,
@@ -349,7 +526,7 @@
 1,null,'20050101','Offline Instructions ',0,
 1,1,null,null,
 null,'20050101','20050101','image',
-1,0,'Online Instructions',1);
+3,1,'Online Instructions',1);
 
 insert into lams_learning_activity
 (activity_id,activity_ui_id,description,title,xcoord,ycoord,parent_activity_id,help_text,
@@ -435,11 +612,11 @@
 grouping_support_type_id, apply_grouping_flag,online_instructions,activity_category_id)
 values
 (18,4,'Question and Answer Activity','Question and Answer',10,20,13,'Help Text for Activity',
-1,null,0,0,
+1,null,0,1,
 1,4,'20050101','Tool Activity Offline  Instructions ',0,
 null,null,4,15,
 null,null,null,'image',
-1,1,'Online Instructions',1);
+1,0,'Online Instructions',1);
 
 insert into lams_learning_activity
 (activity_id,activity_ui_id,description,title,xcoord,ycoord,parent_activity_id,help_text,
@@ -454,7 +631,7 @@
 1,5,'20050101','Tool Activity Offline  Instructions ',0,
 null,null,5,16,
 null,null,null,'image',
-1,1,'Online Instructions',1);
+1,0,'Online Instructions',1);
 
 insert into lams_learning_activity
 (activity_id,activity_ui_id,description,title,xcoord,ycoord,parent_activity_id,help_text,
@@ -465,7 +642,7 @@
 grouping_support_type_id, apply_grouping_flag,online_instructions,activity_category_id)
 values
 (20,6,'Survey Activity','Survey Title',10,20,null,'Help Text for Activity',
-1,null,0,0,
+1,null,0,1,
 1,6,'20050101','Tool Activity Offline  Instructions ',0,
 null,null,6,17,
 null,null,null,'image',
@@ -504,7 +681,7 @@
 'ChatImage',
 null,null,
 7,
-1,1,'Online Instructions',1);
+2,1,'Online Instructions',1);
 
 insert into lams_learning_activity
 (activity_id,activity_ui_id,description,title,xcoord,ycoord,parent_activity_id,help_text,
@@ -519,7 +696,7 @@
 1,8,'20050101','Tool Activity Offline  Instructions ',0,
 null,null,8,19,
 null,null,null,'image',
-1,1,'Online Instructions',1);
+1,0,'Online Instructions',1);
 
 -- Sample GroupingActivity with RandomGrouping 
 
@@ -580,7 +757,7 @@
 'QNA Activity Description','QNA Activity Title','Help Text for QNA Activity',
 10,20,
 null,null,1,
-99,99,0,0,
+99,99,0,1,
 1,4,'20050101',
 1,'QNA Activity Offline  Instructions ',
 null,null,null,
@@ -591,7 +768,7 @@
 'QNAImage',
 null,null,
 4,
-1,1,'Online Instructions',1);
+2,1,'Online Instructions',1);
 
 insert into lams_learning_activity
 (activity_id,activity_ui_id,
@@ -615,7 +792,7 @@
 'QNA Activity Description','QNA Activity Title','Help Text for QNA Activity',
 10,20,
 14,14,1,
-null,null,1,0,
+null,null,1,1,
 1,4,'20050101',
 1,'QNA Activity Offline  Instructions ',
 null,null,null,
@@ -626,8 +803,10 @@
 'QNAImage',
 null,null,
 4,
-1,1,'Online Instructions',1);
+1,0,'Online Instructions',1);
 
+
+
 insert into lams_learning_activity
 (activity_id,activity_ui_id,
 description,title,help_text,
@@ -792,6 +971,9 @@
 								 parent_learning_design_id,workspace_folder_id)
 								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,1);																
 
 -- insert the test data for the content repository
