Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/Tool.hbm.xml
===================================================================
diff -u -r432eded2e44dafaf043b7a6acb26e448cb6697a4 -r950ffe777776ecffa7f99e02b9674f0c71d382ab
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/Tool.hbm.xml (.../Tool.hbm.xml) (revision 432eded2e44dafaf043b7a6acb26e448cb6697a4)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/Tool.hbm.xml (.../Tool.hbm.xml) (revision 950ffe777776ecffa7f99e02b9674f0c71d382ab)
@@ -52,16 +52,16 @@
@hibernate.property
- column="supports_grouping_flag"
- length="1"
+ column="grouping_support_type_id"
+ length="3"
not-null="true"
@@ -91,7 +91,68 @@
not-null="true"
+
+
+ @hibernate.property
+ column="supports_moderation_flag"
+ length="1"
+ not-null="true"
+
+
+
+
+
+ @hibernate.property
+ column="supports_run_offline_flag"
+ length="1"
+ not-null="true"
+
+
+
+
+
+ @hibernate.property
+ column="supports_contribute_flag"
+ length="1"
+ not-null="true"
+
+
+
+
+
+ @hibernate.property
+ column="valid_flag"
+ length="1"
+ not-null="true"
+
+
+
+
+
+
+ @hibernate.property column="create_date_time"
+ length="19" not-null="true"
+
+
-
+
+
+
+ @hibernate.property
+ column="monitor_url"
+ length="65535"
+ not-null="true"
+
+
+
+
+
+ @hibernate.property
+ column="moderation_url"
+ length="65535"
+ not-null="true"
+
+
+
+
+
+ @hibernate.property
+ column="contribute_url"
+ length="65535"
+ not-null="true"
+
+
+
Index: lams_common/db/sql/create_lams_11_tables.sql
===================================================================
diff -u -rab84b2bbb1debe040baba7093cbb26a168b14f42 -r950ffe777776ecffa7f99e02b9674f0c71d382ab
--- lams_common/db/sql/create_lams_11_tables.sql (.../create_lams_11_tables.sql) (revision ab84b2bbb1debe040baba7093cbb26a168b14f42)
+++ lams_common/db/sql/create_lams_11_tables.sql (.../create_lams_11_tables.sql) (revision 950ffe777776ecffa7f99e02b9674f0c71d382ab)
@@ -138,7 +138,7 @@
, workspace_id BIGINT(20) NOT NULL
, user_id BIGINT(20) NOT NULL
, create_date_time DATETIME NOT NULL
- , last_modified_date_time DATETIME NOT NULL
+ , last_modified_date_time DATETIME
, lams_workspace_folder_type_id INT(3) NOT NULL
, PRIMARY KEY (workspace_folder_id)
, INDEX (parent_folder_id)
@@ -242,7 +242,7 @@
, lesson_id BIGINT(20)
, lesson_start_date_time DATETIME
, lesson_name VARCHAR(255)
- , last_modified_date_time DATETIME NOT NULL
+ , last_modified_date_time DATETIME
, PRIMARY KEY (learning_design_id)
, INDEX (parent_learning_design_id)
, CONSTRAINT FK_lams_learning_design_2 FOREIGN KEY (parent_learning_design_id)
Index: lams_common/db/sql/insert_test_data.sql
===================================================================
diff -u -r60b4f19e6e897384015702a56309abb837b76165 -r950ffe777776ecffa7f99e02b9674f0c71d382ab
--- lams_common/db/sql/insert_test_data.sql (.../insert_test_data.sql) (revision 60b4f19e6e897384015702a56309abb837b76165)
+++ lams_common/db/sql/insert_test_data.sql (.../insert_test_data.sql) (revision 950ffe777776ecffa7f99e02b9674f0c71d382ab)
@@ -60,60 +60,82 @@
-- 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,supports_grouping_flag,supports_define_later_flag,
-learner_url,author_url,define_later_url,export_portfolio_url,monitor_url,valid_flag,learning_library_id)
-values(1,'notebook_signature','notebookService','Notebook','Notebook Description',1,0,0,
-'learner_url','author_url','define_later_url','export_portfolio_url','monitor_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,supports_grouping_flag,supports_define_later_flag,
-learner_url,author_url,define_later_url,export_portfolio_url,monitor_url,valid_flag,learning_library_id)
-values(2,'noticeboard_signature','noticeboardService','Noticeboard','Noticeboard Description',2,0,0,
-'learner_url','author_url','define_later_url','export_portfolio_url','monitor_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,supports_grouping_flag,supports_define_later_flag,
-learner_url,author_url,define_later_url,export_portfolio_url,monitor_url,valid_flag,learning_library_id)
-values(3,'multiple_choice_signature','multipleChoiceService','Multiple Choice','Multiple Coice Description',3,0,0,
-'learner_url','author_url','define_later_url','export_portfolio_url','monitor_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,supports_grouping_flag,supports_define_later_flag,
-learner_url,author_url,define_later_url,export_portfolio_url,monitor_url,valid_flag,learning_library_id)
-values(4,'question_answer_signature','questionAnswerService','Question and Answers','Question and Answers Description',4,0,0,
-'learner_url','author_url','define_later_url','export_portfolio_url','monitor_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,supports_grouping_flag,supports_define_later_flag,
-learner_url,author_url,define_later_url,export_portfolio_url,monitor_url,valid_flag,learning_library_id)
-values(5,'message_board_signature','messageBoardService','Message Board','Message Board Description',5,1,0,
-'learner_url','author_url','define_later_url','export_portfolio_url','monitor_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,supports_grouping_flag,supports_define_later_flag,
-learner_url,author_url,define_later_url,export_portfolio_url,monitor_url,valid_flag,learning_library_id)
-values(6,'survey_signature','surveyService','Survey','Survey Description',6,0,0,
-'/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);
+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,supports_grouping_flag,supports_define_later_flag,
-learner_url,author_url,define_later_url,export_portfolio_url,monitor_url,valid_flag,learning_library_id)
-values(7,'chat_signature','chatService','Chat','Chat Description',7,1,0,
-'learner_url','author_url','define_later_url','export_portfolio_url','monitor_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,supports_grouping_flag,supports_define_later_flag,
-learner_url,author_url,define_later_url,export_portfolio_url,monitor_url,valid_flag,learning_library_id)
-values(8,'shared_resources_signature','sharedResourcesService','Shared Resources','Shared Resources Description',8,0,0,
-'learner_url','author_url','define_later_url','export_portfolio_url','monitor_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,supports_grouping_flag,supports_define_later_flag,
-learner_url,author_url,define_later_url,export_portfolio_url,monitor_url,valid_flag,learning_library_id)
-values(9,'voting_signature','votingService','Voting','Voting Description',9,1,0,
-'learner_url','author_url','define_later_url','export_portfolio_url','monitor_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,supports_grouping_flag,supports_define_later_flag,
-learner_url,author_url,define_later_url,export_portfolio_url,monitor_url,valid_flag,learning_library_id)
-values(10,'submit_files_signature','submitFilesService','Submit Files','Submit Files Description',10,0,0,
-'learner_url','author_url','define_later_url','export_portfolio_url','monitor_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,supports_grouping_flag,supports_define_later_flag,
-learner_url,author_url,define_later_url,export_portfolio_url,monitor_url,valid_flag,learning_library_id)
-values(11,'instant_messaging_signature','instantMessagingService','Instant Messaging','Instant Messaging Description',11,0,0,
-'learner_url','author_url','define_later_url','export_portfolio_url','monitor_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)
+values(11,'instant_messaging_signature','instantMessagingService','Instant Messaging','Instant Messaging Description',11,1,0,
+1,1,1,
+'learner_url','author_url','define_later_url','export_portfolio_url','monitor_url',1,11,'2005-02-25 17:37:25');
-- Populates the lams_tool_content table with dummy default content for all above tools
@@ -164,250 +186,290 @@
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,
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)
+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)
values
(1,1,'Notebook Template','Notebook',10,20,null,'Help Text for Activity',
1,null,0,0,
null,1,'20050101','Offline Instructions ',0,
null,null,1,1,
-null,null,null,'NotebookImage');
+null,null,null,'NotebookImage',
+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,
learning_design_id,learning_library_id,create_date_time,offline_instructions,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)
+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)
values
(2,2,'NoticeBoard Template','NoticeBoard',10,20,null,'Help Text for Activity',
1,null,0,0,
null,2,'20050101','Offline Instructions ',0,
null,null,2,2,
-null,null,null,'NoticeBoardImage');
+null,null,null,'NoticeBoardImage',
+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,
learning_design_id,learning_library_id,create_date_time,offline_instructions,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)
+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)
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,null,3,3,
-null,null,null,'MultipleChoiceImage');
+null,null,null,'MultipleChoiceImage',
+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,
learning_design_id,learning_library_id,create_date_time,offline_instructions,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)
+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)
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,null,4,4,
-null,null,null,'QAImage');
+null,null,null,'QAImage',
+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,
learning_design_id,learning_library_id,create_date_time,offline_instructions,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)
+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)
values
(5,5,'MessageBoard Template','MessageBoard',10,20,null,'Help Text for Activity',
1,null,0,0,
null,5,'20050101','Offline Instructions ',0,
null,null,5,5,
-null,null,null,'MBImage');
+null,null,null,'MBImage',
+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,
learning_design_id,learning_library_id,create_date_time,offline_instructions,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)
+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)
values
(6,6,'Survey Template','Survey',10,20,null,'Help Text for Activity',
1,null,0,0,
null,6,'20050101','Offline Instructions ',0,
null,null,6,6,
-null,null,null,'SurveyImage');
+null,null,null,'SurveyImage',
+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,
learning_design_id,learning_library_id,create_date_time,offline_instructions,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)
+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)
values
(7,7,'Chat Template','Chat',10,20,null,'Help Text for Activity',
1,null,0,0,
null,7,'20050101','Offline Instructions ',0,
null,null,7,7,
-null,null,null,'ChatImage');
+null,null,null,'ChatImage',
+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,
learning_design_id,learning_library_id,create_date_time,offline_instructions,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)
+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)
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,null,8,8,
-null,null,null,'SRImage');
+null,null,null,'SRImage',
+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,
learning_design_id,learning_library_id,create_date_time,offline_instructions,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)
+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)
values
(9,9,'Voting Template','Voting',10,20,null,'Help Text for Activity',
1,null,0,0,
null,9,'20050101','Offline Instructions ',0,
null,null,9,9,
-null,null,null,'VotingImage');
+null,null,null,'VotingImage',
+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,
learning_design_id,learning_library_id,create_date_time,offline_instructions,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)
+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)
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,null,10,10,
-null,null,null,'SubmitFilesImage');
+null,null,null,'SubmitFilesImage',
+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,
learning_design_id,learning_library_id,create_date_time,offline_instructions,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)
+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)
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,null,11,11,
-null,null,null,'IMImage');
+null,null,null,'IMImage',
+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,
learning_design_id,learning_library_id,create_date_time,offline_instructions,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)
+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)
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,1,null,null,
-null,'20050101','20050101','image');
+null,'20050101','20050101','image',
+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,
learning_design_id,learning_library_id,create_date_time,offline_instructions,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)
+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)
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,
null,null,null,null,
-null,null,null,'image');
+null,null,null,'image',
+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,
learning_design_id,learning_library_id,create_date_time,offline_instructions,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)
+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)
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,
null,null,null,null,
-null,null,null,'image');
+null,null,null,'image',
+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,
learning_design_id,learning_library_id,create_date_time,offline_instructions,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)
+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)
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,
null,null,1,12,
-null,null,null,'image');
+null,null,null,'image',
+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,
learning_design_id,learning_library_id,create_date_time,offline_instructions,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)
+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)
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,
null,null,2,13,
-null,null,null,'image');
+null,null,null,'image',
+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,
learning_design_id,learning_library_id,create_date_time,offline_instructions,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)
+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)
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,
null,null,3,14,
-null,null,null,'image');
+null,null,null,'image',
+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,
learning_design_id,learning_library_id,create_date_time,offline_instructions,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)
+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)
values
(18,4,'Question and Answer Activity','Question and Answer',10,20,13,'Help Text for Activity',
1,null,0,0,
1,4,'20050101','Tool Activity Offline Instructions ',0,
null,null,4,15,
-null,null,null,'image');
+null,null,null,'image',
+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,
learning_design_id,learning_library_id,create_date_time,offline_instructions,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)
+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)
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,
null,null,5,16,
-null,null,null,'image');
+null,null,null,'image',
+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,
learning_design_id,learning_library_id,create_date_time,offline_instructions,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)
+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)
values
(20,6,'Survey Activity','Survey Title',10,20,null,'Help Text for Activity',
1,null,0,0,
1,6,'20050101','Tool Activity Offline Instructions ',0,
null,null,6,17,
-null,null,null,'image');
+null,null,null,'image',
+1,0,'Online Instructions',1);
insert into lams_learning_activity
(activity_id,activity_ui_id,
@@ -424,7 +486,8 @@
gate_start_date_time,gate_end_date_time,
library_activity_ui_image,
create_grouping_id,create_grouping_ui_id,
-library_activity_id)
+library_activity_id,
+grouping_support_type_id, apply_grouping_flag,online_instructions,activity_category_id)
values
(21,7,
'Chat Activity Description','Chat Title','Help Text for Chat Activity',
@@ -440,20 +503,23 @@
null,null,
'ChatImage',
null,null,
-7);
+7,
+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,
learning_design_id,learning_library_id,create_date_time,offline_instructions,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)
+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)
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,
null,null,8,19,
-null,null,null,'image');
+null,null,null,'image',
+1,0,'Online Instructions',1);
-- Sample GroupingActivity with RandomGrouping
@@ -472,7 +538,8 @@
gate_start_date_time,gate_end_date_time,
library_activity_ui_image,
create_grouping_id,create_grouping_ui_id,
-library_activity_id)
+library_activity_id,
+grouping_support_type_id, apply_grouping_flag,online_instructions,activity_category_id)
values
(23,23,
'Random Grouping Activity Description','RandomGroupingActivity Title','Help Text for RandomGroupingActivity',
@@ -488,7 +555,8 @@
null,null,
'RandomGroupingActivityImage',
99,99,
-null);
+null,
+1,0,'Online Instructions',1);
insert into lams_learning_activity
(activity_id,activity_ui_id,
@@ -505,7 +573,8 @@
gate_start_date_time,gate_end_date_time,
library_activity_ui_image,
create_grouping_id,create_grouping_ui_id,
-library_activity_id)
+library_activity_id,
+grouping_support_type_id, apply_grouping_flag,online_instructions,activity_category_id)
values
(24,24,
'QNA Activity Description','QNA Activity Title','Help Text for QNA Activity',
@@ -521,7 +590,8 @@
null,null,
'QNAImage',
null,null,
-4);
+4,
+1,0,'Online Instructions',1);
insert into lams_learning_activity
(activity_id,activity_ui_id,
@@ -538,7 +608,8 @@
gate_start_date_time,gate_end_date_time,
library_activity_ui_image,
create_grouping_id,create_grouping_ui_id,
-library_activity_id)
+library_activity_id,
+grouping_support_type_id, apply_grouping_flag,online_instructions,activity_category_id)
values
(25,25,
'QNA Activity Description','QNA Activity Title','Help Text for QNA Activity',
@@ -554,7 +625,8 @@
null,null,
'QNAImage',
null,null,
-4);
+4,
+1,0,'Online Instructions',1);
-- Populates the lams_learning_transition table with various transitions for the dummy design
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java
===================================================================
diff -u -rff0c59d252d1cef65a10cad77374dfe72697ba58 -r950ffe777776ecffa7f99e02b9674f0c71d382ab
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java (.../ToolActivity.java) (revision ff0c59d252d1cef65a10cad77374dfe72697ba58)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java (.../ToolActivity.java) (revision 950ffe777776ecffa7f99e02b9674f0c71d382ab)
@@ -164,7 +164,7 @@
*/
public ToolSession createToolSessionForActivity(User learner,Lesson lesson)
{
- if(this.getTool().getGroupingSupportType().intValue()!= 1)
+ if(this.getApplyGrouping().booleanValue())
return new GroupedToolSession(this,
new Date(System.currentTimeMillis()),
ToolSession.STARTED_STATE,
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/ToolActivityStrategy.java
===================================================================
diff -u -rcea596d200043c5589e5501fd9d65147091f8014 -r950ffe777776ecffa7f99e02b9674f0c71d382ab
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/ToolActivityStrategy.java (.../ToolActivityStrategy.java) (revision cea596d200043c5589e5501fd9d65147091f8014)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/ToolActivityStrategy.java (.../ToolActivityStrategy.java) (revision 950ffe777776ecffa7f99e02b9674f0c71d382ab)
@@ -24,9 +24,9 @@
ArrayList contributionType = new ArrayList();
ToolActivity toolActivity = (ToolActivity)activity;
- if(toolActivity.getTool().getSupportsModeration().booleanValue())
+ if(toolActivity.getTool().getSupportsModeration())
contributionType.add(new Integer(MODERATION));
- if(toolActivity.getTool().getSupportsContribute().booleanValue())
+ if(toolActivity.getTool().getSupportsContribute())
contributionType.add(new Integer(CONTRIBUTION));
if(toolActivity.getDefineLater().booleanValue())
contributionType.add(new Integer(DEFINE_LATER));
Index: lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java
===================================================================
diff -u -r8ea17868afd6bfcb9481c78254ded0f4d86cb251 -r950ffe777776ecffa7f99e02b9674f0c71d382ab
--- lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java (.../Tool.java) (revision 8ea17868afd6bfcb9481c78254ded0f4d86cb251)
+++ lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java (.../Tool.java) (revision 950ffe777776ecffa7f99e02b9674f0c71d382ab)
@@ -1,17 +1,17 @@
package org.lamsfoundation.lams.tool;
import java.io.Serializable;
+import java.util.Date;
import java.util.Set;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang.builder.ToStringBuilder;
/**
- * @hibernate.class
- * table="lams_tool"
- *
-*/
+ *
+ * @hibernate.class table="lams_tool"
+ */
public class Tool implements Serializable {
/** identifier field */
@@ -29,6 +29,18 @@
/** persistent field */
private boolean supportsDefineLater;
+ /** persistent field */
+ private boolean supportsModeration;
+
+ /** persistent field */
+ private boolean supportsRunOffline;
+
+ /** persistent field */
+ private boolean supportsContribute;
+
+ /** persistent field */
+ private boolean valid;
+
/** nullable persistent field */
private String defineLaterUrl;
@@ -48,18 +60,57 @@
private String serviceName;
/** persistent field */
+ private Date createDateTime;
+
+ /** persistent field */
private String exportPortfolioUrl;
/** persistent field */
+ private String monitorUrl;
+
+ /** persistent field */
+ private String contributeUrl;
+
+ /** persistent field */
+ private String moderationUrl;
+
+ /** persistent field */
private Set activities;
+ /** persistent field */
+ private Integer groupingSupportTypeId;
+
/** full constructor */
- public Tool(Long toolId, String learnerUrl, boolean supportsGrouping, String authorUrl, boolean supportsDefineLater, String defineLaterUrl, long defaultToolContentId, String toolSignature, String toolDisplayName, String description, String className, String exportPortfolioUrl, Set activities) {
+ public Tool(Long toolId,
+ String learnerUrl,
+ boolean supportsGrouping,
+ String authorUrl,
+ boolean supportsDefineLater,
+ boolean supportsModeration,
+ boolean supportsRunOffline,
+ boolean supportsContribute,
+ String defineLaterUrl,
+ long defaultToolContentId,
+ String toolSignature,
+ String toolDisplayName,
+ String description,
+ String className,
+ String exportPortfolioUrl,
+ Set activities,
+ Integer groupingSupportTypeId,
+ Date createDateTime,
+ String monitorUrl,
+ String contributeUrl,
+ String moderationUrl)
+ {
this.toolId = toolId;
this.learnerUrl = learnerUrl;
this.supportsGrouping = supportsGrouping;
this.authorUrl = authorUrl;
this.supportsDefineLater = supportsDefineLater;
+ this.supportsModeration = supportsModeration;
+ this.supportsContribute = supportsContribute;
+ this.supportsRunOffline = supportsRunOffline;
this.defineLaterUrl = defineLaterUrl;
this.defaultToolContentId = defaultToolContentId;
this.toolSignature = toolSignature;
@@ -68,30 +119,56 @@
this.serviceName = className;
this.exportPortfolioUrl = exportPortfolioUrl;
this.activities = activities;
+ this.groupingSupportTypeId = groupingSupportTypeId;
+ this.createDateTime = createDateTime;
+ this.monitorUrl = monitorUrl;
+ this.contributeUrl = contributeUrl;
+ this.moderationUrl = moderationUrl;
}
/** default constructor */
public Tool() {
}
/** minimal constructor */
- public Tool(Long toolId, String learnerUrl, boolean supportsGrouping, boolean supportsDefineLater, long defaultToolContentId, String toolSignature, String toolDisplayName, String className, String exportPortfolioUrl, Set activities) {
+ public Tool(Long toolId,
+ String learnerUrl,
+ boolean supportsGrouping,
+ boolean supportsDefineLater,
+ boolean supportsModeration,
+ boolean supportsContribute,
+ boolean supportsRunOffline,
+ long defaultToolContentId,
+ String toolSignature,
+ String toolDisplayName,
+ String className,
+ String exportPortfolioUrl,
+ Set activities,
+ Integer groupingSupportTypeId,
+ Date createDateTime,
+ String monitorUrl)
+ {
this.toolId = toolId;
this.learnerUrl = learnerUrl;
this.supportsGrouping = supportsGrouping;
this.supportsDefineLater = supportsDefineLater;
+ this.supportsModeration = supportsModeration;
+ this.supportsContribute = supportsContribute;
+ this.supportsRunOffline = supportsRunOffline;
this.defaultToolContentId = defaultToolContentId;
this.toolSignature = toolSignature;
this.toolDisplayName = toolDisplayName;
this.serviceName = className;
this.exportPortfolioUrl = exportPortfolioUrl;
this.activities = activities;
+ this.groupingSupportTypeId = groupingSupportTypeId;
+ this.createDateTime = createDateTime;
+ this.monitorUrl = monitorUrl;
}
/**
* @hibernate.id generator-class="identity" type="java.lang.Long"
- * column="tool_id"
- *
+ * column="tool_id"
*/
public Long getToolId() {
return this.toolId;
@@ -102,11 +179,8 @@
}
/**
- * @hibernate.property
- * column="learner_url"
- * length="65535"
- * not-null="true"
- *
+ * @hibernate.property column="learner_url"length="65535"
+ * not-null="true"
*/
public String getLearnerUrl() {
return this.learnerUrl;
@@ -117,11 +191,8 @@
}
/**
- * @hibernate.property
- * column="supports_grouping_flag"
- * length="1"
- * not-null="true"
- *
+ * @hibernate.property column="supports_grouping_flag" length="1"
+ * not-null="true"
*/
public boolean getSupportsGrouping() {
return this.supportsGrouping;
@@ -131,11 +202,25 @@
this.supportsGrouping = supportsGrouping;
}
+ /**
+ * @hibernate.property column="supports_contribute_flag" length="1"
+ * not-null="true"
+ * @return Returns the supportsContribute.
+ */
+ public boolean getSupportsContribute()
+ {
+ return supportsContribute;
+ }
+ /**
+ * @param supportsContribute The supportsContribute to set.
+ */
+ public void setSupportsContribute(boolean supportsContribute)
+ {
+ this.supportsContribute = supportsContribute;
+ }
+
/**
- * @hibernate.property
- * column="author_url"
- * length="65535"
- *
+ * @hibernate.property column="author_url" length="65535"
*/
public String getAuthorUrl() {
return this.authorUrl;
@@ -146,11 +231,8 @@
}
/**
- * @hibernate.property
- * column="supports_define_later_flag"
- * length="1"
- * not-null="true"
- *
+ * @hibernate.property column="supports_define_later_flag" length="1"
+ * not-null="true"
*/
public boolean getSupportsDefineLater() {
return this.supportsDefineLater;
@@ -160,11 +242,43 @@
this.supportsDefineLater = supportsDefineLater;
}
+ /**
+ * @hibernate.property column="supports_moderation_flag" length="1"
+ * not-null="true"
+ * @return Returns the supportsModeration.
+ */
+ public boolean getSupportsModeration()
+ {
+ return supportsModeration;
+ }
+ /**
+ * @param supportsModeration The supportsModeration to set.
+ */
+ public void setSupportsModeration(boolean supportsModeration)
+ {
+ this.supportsModeration = supportsModeration;
+ }
+
+ /**
+ * @hibernate.property column="supports_run_offline_flag" length="1"
+ * not-null="true"
+ * @return Returns the supportsRunOffline.
+ */
+ public boolean getSupportsRunOffline()
+ {
+ return supportsRunOffline;
+ }
+
+ /**
+ * @param supportsRunOffline The supportsRunOffline to set.
+ */
+ public void setSupportsRunOffline(boolean supportsRunOffline)
+ {
+ this.supportsRunOffline = supportsRunOffline;
+ }
+
/**
- * @hibernate.property
- * column="define_later_url"
- * length="65535"
- *
+ * @hibernate.property column="define_later_url" length="65535"
*/
public String getDefineLaterUrl() {
return this.defineLaterUrl;
@@ -175,11 +289,8 @@
}
/**
- * @hibernate.property
- * column="default_tool_content_id"
- * length="20"
- * not-null="true"
- *
+ * @hibernate.property column="default_tool_content_id" length="20"
+ * not-null="true"
*/
public long getDefaultToolContentId() {
return this.defaultToolContentId;
@@ -190,11 +301,8 @@
}
/**
- * @hibernate.property
- * column="tool_signature"
- * length="64"
- * not-null="true"
- *
+ * @hibernate.property column="tool_signature" length="64"
+ * not-null="true"
*/
public String getToolSignature() {
return this.toolSignature;
@@ -205,11 +313,8 @@
}
/**
- * @hibernate.property
- * column="tool_display_name"
- * length="255"
- * not-null="true"
- *
+ * @hibernate.property column="tool_display_name" length="255"
+ * not-null="true"
*/
public String getToolDisplayName() {
return this.toolDisplayName;
@@ -220,10 +325,7 @@
}
/**
- * @hibernate.property
- * column="description"
- * length="65535"
- *
+ * @hibernate.property column="description" length="65535"
*/
public String getDescription() {
return this.description;
@@ -234,11 +336,8 @@
}
/**
- * @hibernate.property
- * column="service_name"
- * length="65535"
- * not-null="true"
- *
+ * @hibernate.property column="service_name" length="65535"
+ * not-null="true"
*/
public String getServiceName() {
return this.serviceName;
@@ -249,11 +348,8 @@
}
/**
- * @hibernate.property
- * column="export_portfolio_url"
- * length="65535"
- * not-null="true"
- *
+ * @hibernate.property column="export_portfolio_url" length="65535"
+ * not-null="true"
*/
public String getExportPortfolioUrl() {
return this.exportPortfolioUrl;
@@ -264,13 +360,9 @@
}
/**
- * @hibernate.set
- * lazy="true"
- * inverse="true"
- * cascade="none"
- * @hibernate.collection-key
- * column="tool_id"
- * @hibernate.collection-one-to-many
+ * @hibernate.set lazy="true" inverse="true" cascade="none"
+ * @hibernate.collection-key column="tool_id"
+ * @hibernate.collection-one-to-many
* class="org.lamsfoundation.lams.learningdesign.Activity"
*
*/
@@ -282,6 +374,100 @@
this.activities = activities;
}
+ /**
+ * @hibernate.property column="valid_flag" length="1"
+ * not-null="true"
+ * @return Returns the valid.
+ */
+ public boolean isValid()
+ {
+ return valid;
+ }
+ /**
+ * @param valid The valid to set.
+ */
+ public void setValid(boolean valid)
+ {
+ this.valid = valid;
+ }
+ /**
+ * @return Returns the groupingSupportTypeId.
+ */
+ public Integer getGroupingSupportTypeId()
+ {
+ return groupingSupportTypeId;
+ }
+ /**
+ * @param groupingSupportTypeId The groupingSupportTypeId to set.
+ */
+ public void setGroupingSupportTypeId(Integer groupingSupportTypeId)
+ {
+ this.groupingSupportTypeId = groupingSupportTypeId;
+ }
+
+ /**
+ * @hibernate.property column="create_date_time"
+ length="19" not-null="true"
+ * @return Returns the createDateTime.
+ */
+ public Date getCreateDateTime()
+ {
+ return createDateTime;
+ }
+ /**
+ * @param createDateTime The createDateTime to set.
+ */
+ public void setCreateDateTime(Date createDateTime)
+ {
+ this.createDateTime = createDateTime;
+ }
+
+
+ /**
+ * @hibernate.property column="contribute_url" length="65535"
+ * @return Returns the contributeUrl.
+ */
+ public String getContributeUrl()
+ {
+ return contributeUrl;
+ }
+ /**
+ * @param contributeUrl The contributUrl to set.
+ */
+ public void setContributeUrl(String contributeUrl)
+ {
+ this.contributeUrl = contributeUrl;
+ }
+ /**
+ * @hibernate.property column="moderation_url" length="65535"
+ * @return Returns the moderationUrl.
+ */
+ public String getModerationUrl()
+ {
+ return moderationUrl;
+ }
+ /**
+ * @param moderationUrl The moderationUrl to set.
+ */
+ public void setModerationUrl(String moderationUrl)
+ {
+ this.moderationUrl = moderationUrl;
+ }
+ /**
+ * @hibernate.property column="monitor_url" length="65535"
+ * @return Returns the monitorUrl.
+ */
+ public String getMonitorUrl()
+ {
+ return monitorUrl;
+ }
+ /**
+ * @param monitorUrl The monitorUrl to set.
+ */
+ public void setMonitorUrl(String monitorUrl)
+ {
+ this.monitorUrl = monitorUrl;
+ }
public String toString() {
return new ToStringBuilder(this)
.append("toolId", getToolId())